From 9ea39255f4eda9139c240f688dad9f7c57122b16 Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Thu, 16 Nov 2023 10:42:31 +0100
Subject: [PATCH 1/2] CI: Rename tezos to octez for gitlab registries

---
 scripts/ci/create_gitlab_package.sh | 18 +++++++++---------
 scripts/ci/create_gitlab_release.sh |  6 +++---
 scripts/ci/opam-release.sh          |  4 ++--
 scripts/ci/release.sh               |  6 +++---
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/scripts/ci/create_gitlab_package.sh b/scripts/ci/create_gitlab_package.sh
index 39803bdcb36f..309644216012 100755
--- a/scripts/ci/create_gitlab_package.sh
+++ b/scripts/ci/create_gitlab_package.sh
@@ -13,15 +13,15 @@ set -eu
 
 # https://docs.gitlab.com/ee/user/packages/generic_packages/index.html#download-package-file
 # :gitlab_api_url/projects/:id/packages/generic/:package_name/:package_version/:file_name
-gitlab_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_package_name}/${gitlab_package_version}"
-gitlab_deb_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_deb_package_name}/${gitlab_package_version}"
-gitlab_rpm_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_rpm_package_name}/${gitlab_package_version}"
+gitlab_octez_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_package_name}/${gitlab_package_version}"
+gitlab_octez_deb_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_deb_package_name}/${gitlab_package_version}"
+gitlab_octez_rpm_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_rpm_package_name}/${gitlab_package_version}"
 
 gitlab_upload() {
   local_path="${1}"
   remote_file="${2}"
-  url="${3-${gitlab_package_url}}"
-  echo "Upload to ${gitlab_package_url}/${remote_file}"
+  url="${3-${gitlab_octez_package_url}}"
+  echo "Upload to ${gitlab_octez_package_url}/${remote_file}"
 
   i=0
   max_attempts=10
@@ -66,7 +66,7 @@ do
   # Loop over debian packages
   for package in ${deb_packages}
   do
-    gitlab_upload "${package}" "${package}" "${gitlab_deb_package_url}"
+    gitlab_upload "${package}" "${package}" "${gitlab_octez_deb_package_url}"
   done
 
   echo "Upload rpm packages (${architecture})"
@@ -74,7 +74,7 @@ do
   # Loop over rpm packages
   for package in ${rpm_packages}
   do
-    gitlab_upload "./${package}" "${package}" "${gitlab_rpm_package_url}"
+    gitlab_upload "./${package}" "${package}" "${gitlab_octez_rpm_package_url}"
   done
 
   echo "Upload tarball with all binaries (${architecture})"
@@ -84,7 +84,7 @@ do
 
   cd octez-binaries/
   tar -czf "octez-${architecture}.tar.gz" "octez-${architecture}/"
-  gitlab_upload "octez-${architecture}.tar.gz" "${gitlab_package_name}-linux-${architecture}.tar.gz"
+  gitlab_upload "octez-${architecture}.tar.gz" "${gitlab_octez_package_name}-linux-${architecture}.tar.gz"
   cd ..
 done
 
@@ -93,7 +93,7 @@ done
 # => create and upload manually
 echo 'Upload tarball of source code and its checksums'
 
-source_tarball="${gitlab_package_name}.tar.bz2"
+source_tarball="${gitlab_octez_package_name}.tar.bz2"
 
 # We are using the export-subst feature of git onfigured in .gitattributes, requires git version >= 2.35
 # https://git-scm.com/docs/git-archive
diff --git a/scripts/ci/create_gitlab_release.sh b/scripts/ci/create_gitlab_release.sh
index cb89f17bacee..57c3d10b1fb9 100755
--- a/scripts/ci/create_gitlab_release.sh
+++ b/scripts/ci/create_gitlab_release.sh
@@ -16,17 +16,17 @@ echo "Query GitLab to get generic package URL"
 # :gitlab_api_url/projects/:id/packages
 web_path=$(curl -fsSL -X GET \
                 -H "JOB-TOKEN: ${CI_JOB_TOKEN}" \
-                "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages?sort=desc&package_name=${gitlab_package_name}" \
+                "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages?sort=desc&package_name=${gitlab_octez_package_name}" \
            | jq -r ".[] | select(.version==\"${gitlab_package_version}\") | ._links.web_path")
 
 deb_web_path=$(curl -fsSL -X GET \
                     -H "JOB-TOKEN: ${CI_JOB_TOKEN}" \
-                    "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages?sort=desc&package_name=${gitlab_deb_package_name}" \
+                    "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages?sort=desc&package_name=${gitlab_octez_deb_package_name}" \
            | jq -r ".[] | select(.version==\"${gitlab_package_version}\") | ._links.web_path")
 
 rpm_web_path=$(curl -fsSL -X GET \
                     -H "JOB-TOKEN: ${CI_JOB_TOKEN}" \
-                    "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages?sort=desc&package_name=${gitlab_rpm_package_name}" \
+                    "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages?sort=desc&package_name=${gitlab_octez_rpm_package_name}" \
            | jq -r ".[] | select(.version==\"${gitlab_package_version}\") | ._links.web_path")
 
 if [ -z "${web_path}" ]
diff --git a/scripts/ci/opam-release.sh b/scripts/ci/opam-release.sh
index e99a9ff3ab3a..1e27f0f0c7c8 100755
--- a/scripts/ci/opam-release.sh
+++ b/scripts/ci/opam-release.sh
@@ -27,12 +27,12 @@ log "Done setting up credentials."
 # call opam-release.sh with the correct arguments
 echo "$script_dir/opam-release.sh" \
   "$opam_release_tag" \
-  "https://gitlab.com/tezos/tezos/-/archive/$CI_COMMIT_TAG/$gitlab_package_name.tar.gz" \
+  "https://gitlab.com/tezos/tezos/-/archive/$CI_COMMIT_TAG/$gitlab_octez_package_name.tar.gz" \
   "$opam_dir"
 
 "$script_dir/opam-release.sh" \
   "$opam_release_tag" \
-  "https://gitlab.com/tezos/tezos/-/archive/$CI_COMMIT_TAG/$gitlab_package_name.tar.gz" \
+  "https://gitlab.com/tezos/tezos/-/archive/$CI_COMMIT_TAG/$gitlab_octez_package_name.tar.gz" \
   "$opam_dir"
 
 # Matches the corresponding variable in /scripts/opam-release.sh.
diff --git a/scripts/ci/release.sh b/scripts/ci/release.sh
index 3ff4a5e8bccd..4afd1e0fad17 100755
--- a/scripts/ci/release.sh
+++ b/scripts/ci/release.sh
@@ -48,9 +48,9 @@ fi
 
 ### Compute GitLab generic package names
 
-gitlab_package_name="${CI_PROJECT_NAME}-${gitlab_release_no_v}"
-gitlab_deb_package_name="${CI_PROJECT_NAME}-debian-${gitlab_release_no_v}"
-gitlab_rpm_package_name="${CI_PROJECT_NAME}-redhat-${gitlab_release_no_v}"
+gitlab_octez_package_name="octez-${gitlab_release_no_v}"
+gitlab_octez_deb_package_name="octez-debian-${gitlab_release_no_v}"
+gitlab_octez_rpm_package_name="octez-redhat-${gitlab_release_no_v}"
 
 # X.Y or X.Y-rcZ
 gitlab_package_version="${gitlab_release_no_v}"
-- 
GitLab


From 1942ff0036edde84a8beaa4ac455e66a302073c5 Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Tue, 21 Nov 2023 14:17:56 +0100
Subject: [PATCH 2/2] CHANGES: Add entries

---
 CHANGES.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index c530ba7556cb..ab04e6da75d9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -166,3 +166,7 @@ Miscellaneous
 
 - Extended the Micheline lexer to allow primitives starting with the
   underscore symbol (``_``). (MR :gl:`!10782`)
+
+- Beta Debian and Redhat packages are now linked in gitlab releases.
+
+- Renamed package registries for releases from ``tezos-x.y`` to ``octez-x.y``.
-- 
GitLab