From d2a1b934b0c69e4eeadf4ef0346fbdcff4cee215 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Fri, 30 Sep 2022 13:46:30 -0400
Subject: [PATCH] gitlab-ci: refactor upload jobs

This should make things more consistent.
---
 .gitlab-ci.yml     |  2 +-
 .gitlab/upload.yml | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac8e45c1cf..b704ca506f 100644
--- a/.gitlab-ci.yml
+++ b/.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:
diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml
index 42f7694d43..795109a14a 100644
--- a/.gitlab/upload.yml
+++ b/.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"