From 1c789edf4ffd06d567ec9d10e94674448933f9af Mon Sep 17 00:00:00 2001
From: Romain Bardou <romain@nomadic-labs.com>
Date: Thu, 15 Sep 2022 17:16:59 +0200
Subject: [PATCH 1/2] CI: add intermediate release stages

---
 .gitlab-ci.yml                 | 2 ++
 .gitlab/ci/publish_release.yml | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0962dc091b6a..1c94fa156776 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,8 @@ stages:
   - test_coverage
   - packaging
   - doc
+  - prepare_release
+  - publish_release_gitlab
   - publish_release
   - manual
 
diff --git a/.gitlab/ci/publish_release.yml b/.gitlab/ci/publish_release.yml
index 9dbc779648b9..601912454025 100644
--- a/.gitlab/ci/publish_release.yml
+++ b/.gitlab/ci/publish_release.yml
@@ -4,7 +4,7 @@ gitlab:release:
     - .rules_template__release_tag
   # https://gitlab.com/tezos/docker-images/ci-release
   image: "${CI_REGISTRY}/tezos/docker-images/ci-release:v1.1.0"
-  stage: publish_release
+  stage: publish_release_gitlab
   # Publish jobs are uninterruptible to avoid publishing partial results.
   interruptible: false
   dependencies:
@@ -23,7 +23,7 @@ docker:merge_manifests:
     - .rules_template__master_and_releases
     - .image_template__docker
     - .docker_registry_auth # Sets up a before_script
-  stage: publish_release
+  stage: prepare_release
   script:
     - ./scripts/ci/docker_merge_manifests.sh
 
-- 
GitLab


From bdc1b1d55c0d3bffabb8d45887b6b6f804aba7fd Mon Sep 17 00:00:00 2001
From: Romain Bardou <romain@nomadic-labs.com>
Date: Mon, 19 Sep 2022 11:56:51 +0200
Subject: [PATCH 2/2] CI: fix gitlab-take-ownership

---
 .gitlab/ci/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab/ci/Makefile b/.gitlab/ci/Makefile
index 37817889659c..c8065f29dc39 100644
--- a/.gitlab/ci/Makefile
+++ b/.gitlab/ci/Makefile
@@ -159,7 +159,7 @@ gitlab-release:
 .PHONY: gitlab-take-ownership
 gitlab-take-ownership:
 	# Note: Only done in Gitlab CI context
-ifndef CI_PROJECT_DIR
+ifdef CI_PROJECT_DIR
 	# FIXME: https://gitlab.com/tezos/tezos/-/issues/2865
-	sudo chown -R $(id -u):$(id -g) ${CI_PROJECT_DIR}
+	sudo chown -R $(shell id -u):$(shell id -g) ${CI_PROJECT_DIR}
 endif
-- 
GitLab