one more test

replicatedhq · Jan 26, 2024 · ee734a5 · ee734a5
1 parent 14d3630
commit ee734a5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
@@ -39,22 +39,17 @@ jobs:
         GIT_TAG: ${{ needs.generate-tag.outputs.tag }}
       run: mapfile -t envs < <(grep -v '#.*' < .image.env) && export "${envs[@]}" && make kotsadm-bundle-nominio
 
-    - name: tar up the bundles
-      run: |
-        tar -czvf kotsadm.tar.gz kotsadm-bundle
-        tar -czvf kotsadm-nominio.tar.gz kotsadm-bundle-nominio
-
     - name: Upload kotsadm bundle
       uses: actions/upload-artifact@v4
       with:
         name: kotsadm-bundle
-        path: kotsadm.tar.gz
+        path: kotsadm-bundle
 
     - name: Upload kotsadm bundle without minio
       uses: actions/upload-artifact@v4
       with:
         name: kotsadm-bundle-nominio
-        path: kotsadm-nominio.tar.gz
+        path: kotsadm-bundle-nominio
 
   # can-run-ci:
   #   runs-on: ubuntu-20.04

diff --git a/scripts/create-airgap-file.sh b/scripts/create-airgap-file.sh
@@ -9,11 +9,11 @@ kind: Airgap
 spec:
   format: docker
   savedImages:
-  - kotsadm/kotsadm:${GIT_TAG}
-  - kotsadm/kotsadm-migrations:${GIT_TAG}
-  - kotsadm/dex:${DEX_TAG}
-  - kotsadm/rqlite:${RQLITE_TAG}
-  - kotsadm/local-volume-provider:${LVP_TAG}
+  - kotsadm/kotsadm:${GIT_TAG//\'/}
+  - kotsadm/kotsadm-migrations:${GIT_TAG//\'/}
+  - kotsadm/dex:${DEX_TAG//\'/}
+  - kotsadm/rqlite:${RQLITE_TAG//\'/}
+  - replicated/local-volume-provider:${LVP_TAG//\'/}
 EOF
 else
 	cat > "${BUNDLE_DIR}"/airgap.yaml <<EOF
@@ -22,11 +22,11 @@ kind: Airgap
 spec:
   format: docker
   savedImages:
-  - kotsadm/kotsadm:${GIT_TAG}
-  - kotsadm/kotsadm-migrations:${GIT_TAG}
-  - kotsadm/dex:${DEX_TAG}
-  - kotsadm/minio:${MINIO_TAG}
-  - kotsadm/rqlite:${RQLITE_TAG}
-  - kotsadm/local-volume-provider:${LVP_TAG}
+  - kotsadm/kotsadm:${GIT_TAG//\'/}
+  - kotsadm/kotsadm-migrations:${GIT_TAG//\'/}
+  - kotsadm/dex:${DEX_TAG//\'/}
+  - kotsadm/minio:${MINIO_TAG//\'/}
+  - kotsadm/rqlite:${RQLITE_TAG//\'/}
+  - replicated/local-volume-provider:${LVP_TAG//\'/}
 EOF
 fi