test e2e

mesosphere · Sep 30, 2024 · 49ab833 · 49ab833
1 parent 66e8496
commit 49ab833
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 37 deletions.
diff --git a/.github/workflows/release-vsphere-template.yaml b/.github/workflows/release-vsphere-template.yaml
@@ -13,22 +13,24 @@ jobs:
       max-parallel: 10
       matrix:
         include:
-          - os: "redhat 8.6"
-            buildConfig: "offline"
-          - os: "redhat 8.6"
-            buildConfig: "offline-fips"
-          - os: "redhat 8.8"
-            buildConfig: "offline"
-          - os: "redhat 8.8"
-            buildConfig: "offline-fips"
-          - os: "ubuntu 20.04"
-            buildConfig: "basic"
-          - os: "ubuntu 22.04"
-            buildConfig: "basic"
-          - os: "rocky 9.1"
-            buildConfig: "offline"
-          - os: "flatcar"
-            buildConfig: "basic"
+        - os: "oracle 9.4"
+          buildConfig: "offline"
+          # - os: "redhat 8.6"
+          #   buildConfig: "offline"
+          # - os: "redhat 8.6"
+          #   buildConfig: "offline-fips"
+          # - os: "redhat 8.8"
+          #   buildConfig: "offline"
+          # - os: "redhat 8.8"
+          #   buildConfig: "offline-fips"
+          # - os: "ubuntu 20.04"
+          #   buildConfig: "basic"
+          # - os: "ubuntu 22.04"
+          #   buildConfig: "basic"
+          # - os: "rocky 9.1"
+          #   buildConfig: "offline"
+          # - os: "flatcar"
+          #   buildConfig: "basic"
     runs-on:
     - self-hosted
     - medium

diff --git a/.github/workflows/vsphere-e2e.yaml b/.github/workflows/vsphere-e2e.yaml
@@ -15,26 +15,28 @@ jobs:
       max-parallel: 8
       matrix:
         include:
-        - os: "redhat 8.6"
-          buildConfig: "offline"
-        - os: "redhat 8.6"
-          buildConfig: "offline-fips"
-        - os: "redhat 8.8"
-          buildConfig: "offline"
-        - os: "redhat 8.8"
-          buildConfig: "offline-fips"
-        - os: "ubuntu 20.04"
-          buildConfig: "offline"
-        - os: "ubuntu 20.04"
-          buildConfig: "basic"
-        - os: "ubuntu 22.04"
-          buildConfig: "basic"
-        - os: "rocky 9.1"
-          buildConfig: "offline"
         - os: "oracle 9.4"
-          buildConfig: "basic"
-        - os: "flatcar"
-          buildConfig: "basic"
+          buildConfig: "offline"
+        # - os: "redhat 8.6"
+        #   buildConfig: "offline"
+        # - os: "redhat 8.6"
+        #   buildConfig: "offline-fips"
+        # - os: "redhat 8.8"
+        #   buildConfig: "offline"
+        # - os: "redhat 8.8"
+        #   buildConfig: "offline-fips"
+        # - os: "ubuntu 20.04"
+        #   buildConfig: "offline"
+        # - os: "ubuntu 20.04"
+        #   buildConfig: "basic"
+        # - os: "ubuntu 22.04"
+        #   buildConfig: "basic"
+        # - os: "rocky 9.1"
+        #   buildConfig: "offline"
+        # - os: "oracle 9.4"
+        #   buildConfig: "basic"
+        # - os: "flatcar"
+        #   buildConfig: "basic"
     runs-on:
     - self-hosted
     - medium

diff --git a/bundles/oracle9.4/bundle.sh.gotmpl b/bundles/oracle9.4/bundle.sh.gotmpl
@@ -46,8 +46,8 @@ createrepo_mod .
 
 # Package the repository into a tarball with proper permissions
 # shellcheck disable=SC1083,SC2035
-tar -czf {{ .OutputDirectory }}/{{ .KubernetesVersion }}_oracle_9.4_x86_64{{ .FipsSuffix }}.tar.gz *
-chmod 777 {{ .OutputDirectory }}/{{ .KubernetesVersion }}_oracle_9.4_x86_64{{ .FipsSuffix }}.tar.gz
+tar -czf {{ .OutputDirectory }}/{{ .KubernetesVersion }}_oraclelinux_9.4_x86_64{{ .FipsSuffix }}.tar.gz *
+chmod 777 {{ .OutputDirectory }}/{{ .KubernetesVersion }}_oraclelinux_9.4_x86_64{{ .FipsSuffix }}.tar.gz
 
 # Return to the original directory and clean up
 popd