Merge topic 'ci-fix-upload-jobs' into release

d2a1b934 gitlab-ci: refactor upload jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Patrick Avery <patrick.avery@kitware.com>
Merge-request: !9592

.gitlab-ci.yml

@@ -630,7 +630,7 @@ documentation:upload:
     needs:
         - documentation:build
     variables:
-        SRC_SUBDIR: install/usr/share/doc/vtk/doxygen/html/
+        RSYNC_SOURCE: build/install/usr/share/doc/vtk/doxygen/html/
         RSYNC_DESTINATION: VTKDoxygen/html
 
 source:build:

.gitlab/upload.yml

@@ -13,14 +13,18 @@
     script:
         - ls build/
         - dnf install -y --setopt=install_weak_deps=False rsync openssh-clients
-        - chmod 400 $RSYNC_BINARY_KEY
-        - ssh-keygen -y -f $RSYNC_BINARY_KEY > $RSYNC_BINARY_KEY.pub
-        - rsync -tv --recursive -e "ssh -i $RSYNC_BINARY_KEY -o StrictHostKeyChecking=no" build/$SRC_SUBDIR kitware@web.kitware.com:$RSYNC_DESTINATION/
+        - chmod 400 $RSYNC_KEY_PATH
+        - ssh-keygen -y -f $RSYNC_KEY_PATH > $RSYNC_KEY_PATH.pub
+        - rsync -tv --recursive -e "ssh -i $RSYNC_KEY_PATH -o StrictHostKeyChecking=no" $RSYNC_SOURCE kitware@web.kitware.com:$RSYNC_DESTINATION/
+    variables:
+        RSYNC_KEY_PATH: $RSYNC_BINARY_KEY
 
 .rsync_upload_wheel_sdk:
     extends: .rsync_upload
     environment:
         name: rsync-upload-wheel-sdk
+    variables:
+        RSYNC_KEY_PATH: $RSYNC_WHEEL_SDK_KEY
 
 .pypi_upload:
     image: "fedora:34"