diff --git a/.github/workflows/release-vsphere-template.yaml b/.github/workflows/release-vsphere-template.yaml index 3d00cb32e..3b390c14a 100644 --- 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 index f53ae4b22..f013cfab1 100644 --- 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 index 387ebcf15..a1834e504 100755 --- 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