From dcbcf28e302911f80510d2b2ccbf1ed8da02ce03 Mon Sep 17 00:00:00 2001
From: TC <tc@geekministry.org>
Date: Sun, 16 Mar 2025 22:45:57 +0000
Subject: [PATCH] Further adventures in CICD evolving [ci dryrun]

---
 .gitlab-ci.yml                                       |  6 ++++++
 .../distribute-stable-packages.sh                    | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd00073f..24383164 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -263,6 +263,10 @@ dryrun_create_build_machines:
   script:
     - uv --directory scripts/cicd-python sync
     - uv --directory scripts/cicd-python run veilid_release_utils.py --create-build-machine
+  artifacts:
+    paths: 
+      - scripts/cicd-python/config.json
+    expire_in: 6 hours
   rules:
     - if: $CI_COMMIT_MESSAGE =~ /\[ci dryrun]/
 
@@ -337,7 +341,9 @@ dryrun_delete_build_machines:
     - dryrun_deploy_repos
   tags:
     - build-orchestration
+    - dryrun_create_build_machines]
   script:
+    - cp config.json /scripts/cicd-python/config.json
     - uv --directory scripts/cicd-python sync
     - uv --directory scripts/cicd-python run veilid_release_utils.py --delete-build-machine
   rules:
diff --git a/scripts/cicd/build-orchestration/distribute-stable-packages.sh b/scripts/cicd/build-orchestration/distribute-stable-packages.sh
index 37b14305..81f8f8b3 100644
--- a/scripts/cicd/build-orchestration/distribute-stable-packages.sh
+++ b/scripts/cicd/build-orchestration/distribute-stable-packages.sh
@@ -15,9 +15,9 @@ gpg --armor --export admin@veilid.org > $HOME/srv/gpg/veilid-packages-key.public
 
 # Copy .deb files into the workspace and generate repo files
 echo "Starting deb process"
-cd $HOME
-tar -xf amd64-debs.tar
-tar -xf arm64-debs.tar
+#cd $HOME
+#tar -xf amd64-debs.tar
+#tar -xf arm64-debs.tar
 cp *.deb $HOME/srv/apt/pool/stable/main
 cd $HOME/srv/apt
 echo "Creating Packages file"
@@ -34,8 +34,8 @@ cat $HOME/srv/apt/dists/stable/Release | gpg --default-key admin@veilid.org -abs
 
 # Copy .rpm files into the workspace and generate repo files
 echo "Starting rpm process"
-cd $HOME
-tar -xf amd64-rpms.tar
+#cd $HOME
+#tar -xf amd64-rpms.tar
 echo "Copying rpms to container workspace"
 cp *x86_64.rpm $HOME/rpm-build-container/mount/repo/stable/x86_64
 echo "Copying signing material to container workspace"
@@ -72,7 +72,7 @@ rsync --archive --delete $HOME/srv/* gitlab-runner@10.116.0.3:/srv
 # Cleanup
 echo "Cleaning up the workspace"
 rm -rf $GNUPGHOME
-rm $HOME/*.tar
+#rm $HOME/*.tar
 rm $HOME/*.deb
 rm $HOME/*.rpm
 rm -rf $HOME/rpm-build-container/mount/keystore/*