Merge topic 'ci-package-uploads'

b20a19fca1 Merge branch 'backport-3.22-ci-package-uploads' into ci-package-uploads
cb44e0d47c gitlab-ci: distinguish release and development pipeline schedules
3a9a9a3ace gitlab-ci: clarify name of package upload job template

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7142

4 files changed, 18 insertions, 37 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index baa04e56a1..3cc5a6c8ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,14 +61,12 @@ p:doc-package:
 
 u:source-package:
     extends:
-        - .rsync_upload_binary
+        - .rsync_upload_package
         - .run_only_for_package
     dependencies:
         - p:source-package
     needs:
         - p:source-package
-    variables:
-        RSYNC_DESTINATION: dev
 
 # Documentation builds
 
@@ -605,14 +603,12 @@ b:linux-x86_64-package:
 
 u:linux-x86_64-package:
     extends:
-        - .rsync_upload_binary
+        - .rsync_upload_package
         - .run_only_for_package
     dependencies:
         - b:linux-x86_64-package
     needs:
         - b:linux-x86_64-package
-    variables:
-        RSYNC_DESTINATION: dev
 
 b:linux-aarch64-package:
     extends:
@@ -629,14 +625,12 @@ b:linux-aarch64-package:
 
 u:linux-aarch64-package:
     extends:
-        - .rsync_upload_binary
+        - .rsync_upload_package
         - .run_only_for_package
     dependencies:
         - b:linux-aarch64-package
     needs:
         - b:linux-aarch64-package
-    variables:
-        RSYNC_DESTINATION: dev
 
 ## Sanitizer builds
 
@@ -770,14 +764,12 @@ b:macos-package:
 
 u:macos-package:
     extends:
-        - .rsync_upload_binary
+        - .rsync_upload_package
         - .run_only_for_package
     dependencies:
         - b:macos-package
     needs:
         - b:macos-package
-    variables:
-        RSYNC_DESTINATION: dev
 
 b:macos10.10-package:
     extends:
@@ -793,14 +785,12 @@ b:macos10.10-package:
 
 u:macos10.10-package:
     extends:
-        - .rsync_upload_binary
+        - .rsync_upload_package
         - .run_only_for_package
     dependencies:
         - b:macos10.10-package
     needs:
         - b:macos10.10-package
-    variables:
-        RSYNC_DESTINATION: dev
 
 # Windows builds
 
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml
index 9302da4de8..f696c9064b 100644
--- a/.gitlab/rules.yml
+++ b/.gitlab/rules.yml
@@ -2,7 +2,7 @@
 
 .run_manually:
     rules:
-        - if: '$CMAKE_CI_PACKAGE == "true"'
+        - if: '$CMAKE_CI_PACKAGE != null'
           when: never
         - if: '$CMAKE_CI_NIGHTLY == "true"'
           when: on_success
@@ -23,7 +23,7 @@
 
 .run_automatically:
     rules:
-        - if: '$CMAKE_CI_PACKAGE == "true"'
+        - if: '$CMAKE_CI_PACKAGE != null'
           when: never
         - if: '$CMAKE_CI_NIGHTLY == "true"'
           when: on_success
@@ -44,7 +44,7 @@
 
 .run_dependent:
     rules:
-        - if: '$CMAKE_CI_PACKAGE == "true"'
+        - if: '$CMAKE_CI_PACKAGE != null'
           when: never
         - if: '($CMAKE_CI_NIGHTLY == "true" && $CMAKE_CI_NIGHTLY_IGNORE_DEPS == "true")'
           when: always
@@ -64,7 +64,11 @@
 
 .run_only_for_package:
     rules:
-        - if: '$CMAKE_CI_PACKAGE == "true"'
+        - if: '$CMAKE_CI_PACKAGE != null && $CMAKE_CI_JOB_UPLOAD_PACKAGE == null'
+          when: on_success
+        - if: '$CMAKE_CI_PACKAGE == "dev" && $CMAKE_CI_JOB_UPLOAD_PACKAGE == "true"'
+          variables:
+              RSYNC_DESTINATION: "dev"
           when: on_success
         - when: never
 
diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml
index dc7da7e080..a1d86a6736 100644
--- a/.gitlab/upload.yml
+++ b/.gitlab/upload.yml
@@ -1,6 +1,6 @@
 # Steps for uploading artifacts
 
-.rsync_upload_binary:
+.rsync_upload_package:
     image: "fedora:35"
     stage: upload
     tags:
@@ -18,6 +18,9 @@
         - ssh-keygen -y -f $RSYNC_BINARY_KEY > $RSYNC_BINARY_KEY.pub
         - rsync -tv --recursive -e "ssh -i $RSYNC_BINARY_KEY -o StrictHostKeyChecking=no -o LogLevel=ERROR" build/ kitware@cmake.org:$RSYNC_DESTINATION/
 
+    variables:
+        CMAKE_CI_JOB_UPLOAD_PACKAGE: "true"
+
 .rsync_upload_help:
     stage: upload
     image: "fedora:35"
diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst
index 151ea5a1b2..53be91f005 100644
--- a/Help/dev/maint.rst
+++ b/Help/dev/maint.rst
@@ -245,20 +245,6 @@ Commit with a message such as::
   Release versions do not have the development topic section of
   the CMake Release Notes index page.
 
-Update ``.gitlab-ci.yml`` to drop the upload jobs from the
-packaging pipeline by renaming them to start in ``.``:
-
-.. code-block:: shell
-
-  sed -i 's/^u:/.u:/' .gitlab-ci.yml
-
-Commit with a message such as::
-
-  gitlab-ci: Drop package pipeline upload jobs for release branch
-
-  The package pipeline for release versions should not upload packages
-  automatically to our archive of nightly development versions.
-
 Update ``Source/CMakeVersion.cmake`` to set the version to
 ``$major.$minor.0-rc0``:
 
@@ -290,15 +276,13 @@ Merge the ``release-$ver`` branch to ``master``:
   git merge --no-ff release-$ver
 
 Begin post-release development by restoring the development branch release
-note infrastructure, the nightly package pipeline upload jobs, and
-the version date from ``origin/master``:
+note infrastructure, and the version date from ``origin/master``:
 
 .. code-block:: shell
 
   git checkout origin/master -- \
     Source/CMakeVersion.cmake Help/release/dev/0-sample-topic.rst
   sed -i $'/^Releases/ i\\\n.. include:: dev.txt\\\n' Help/release/index.rst
-  sed -i 's/^\.u:/u:/' .gitlab-ci.yml
 
 Update ``Source/CMakeVersion.cmake`` to set the version to
 ``$major.$minor.$date``: