From 13f2dc79432c38898c9be1e450778be0b5e17d65 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Fri, 21 Jun 2024 10:48:58 -0500
Subject: [PATCH] Try manually running uploads

---
 .gitlab-ci-build.yml.in | 14 ++------------
 .gitlab-ci.yml          |  9 +++++----
 cache.sh                |  2 +-
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci-build.yml.in b/.gitlab-ci-build.yml.in
index 13bef34..770b879 100644
--- a/.gitlab-ci-build.yml.in
+++ b/.gitlab-ci-build.yml.in
@@ -11,10 +11,6 @@ stages:
           - sources/build.pkr.hcl
       paths:
         - ./packer_config/
-    - key: isofiles
-      paths:
-        - ./cache/*.iso
-      policy: pull
   rules:
     - if: $CI_COMMIT_TAG
       variables:
@@ -46,6 +42,8 @@ stages:
   before_script:
     - packer init sources
     - echo $COMMAND
+    - mc alias add storage "localhost:9000" root "$MINIO_SECRET"
+    - mc get storage/isos
   script:
     - ls -l cache/
     - echo $COMMAND > build.sh
@@ -68,10 +66,6 @@ virtualbox-iso.amd64:
     tag: vbox
   parallel:
     matrix: []
-  after_script: |-
-    if [ "$CI_JOB_STATUS" == "success" ]; then
-      xonsh test.xsh
-    fi
 
 hyperv-iso.amd64:
   extends: .build
@@ -85,10 +79,6 @@ hyperv-iso.amd64:
     - echo $env:COMMAND > build.ps1
     - echo 'if (-not $?) { throw "Error in build"}' >> build.ps1
     - pwsh .\build.ps1
-  after_script: |-
-    if ( "$CI_JOB_STATUS" -eq "success" ) {
-      xonsh test.xsh
-    }
 
 "Create release":
   stage: release
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 930f921..f57e488 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,13 +69,14 @@ downloads:
           - sources/build.pkr.hcl
       paths:
         - ./packer_config/
-    - key: isofiles
-      paths:
-        - ./cache/*.iso
-      policy: pull-push
   script:
     - packer init sources
     - bash cache.sh
+    - mc alias add storage "localhost:9000" root "$MINIO_SECRET"
+    - |
+      for f in cache/*; do
+        mc put "$f" "storage/isos/$(basename "$f")"
+      end
 
 trigger:
   stage: trigger
diff --git a/cache.sh b/cache.sh
index f7fad98..dc42722 100755
--- a/cache.sh
+++ b/cache.sh
@@ -23,4 +23,4 @@ echo "Downloading ${files[*]}"
 curl --parallel -L "${files[@]}"
 popd
 
-ls -l cache/
+ls -lh cache/