diff --git a/.github/actions/cmx-versions/dist/index.js b/.github/actions/cmx-versions/dist/index.js index 6a28fb5826..c39d208bed 100644 --- a/.github/actions/cmx-versions/dist/index.js +++ b/.github/actions/cmx-versions/dist/index.js @@ -7659,7 +7659,7 @@ async function getClusterVersions() { const versionsToTest = []; clusterVersions.forEach((distribution) => { - const distroName = distribution.short_name; + let distroName = distribution.short_name; if (distroName === 'helmvm' || distroName === 'kurl') { // excluding the embedded distributions @@ -7667,6 +7667,8 @@ async function getClusterVersions() { } if (distroName === 'openshift') { + // use new experimental openshift distribution + distroName = 'openshift-exp'; // filtering out all versions except 4.13.0-okd for now per sc-90893 distribution.versions = distribution.versions.filter((version) => version === '4.13.0-okd'); } @@ -7710,4 +7712,4 @@ getClusterVersions(); module.exports = __webpack_exports__; /******/ })() -; +; \ No newline at end of file diff --git a/.github/actions/cmx-versions/index.js b/.github/actions/cmx-versions/index.js index 213ffe0939..3b4109bb0f 100644 --- a/.github/actions/cmx-versions/index.js +++ b/.github/actions/cmx-versions/index.js @@ -39,7 +39,7 @@ async function getClusterVersions() { const versionsToTest = []; clusterVersions.forEach((distribution) => { - const distroName = distribution.short_name; + let distroName = distribution.short_name; if (distroName === 'helmvm' || distroName === 'kurl') { // excluding the embedded distributions @@ -47,6 +47,8 @@ async function getClusterVersions() { } if (distroName === 'openshift') { + // use new experimental openshift distribution + distroName = 'openshift-exp'; // filtering out all versions except 4.13.0-okd for now per sc-90893 distribution.versions = distribution.versions.filter((version) => version === '4.13.0-okd'); } diff --git a/.github/actions/kots-e2e/action.yml b/.github/actions/kots-e2e/action.yml index b29e504075..6fa9731182 100644 --- a/.github/actions/kots-e2e/action.yml +++ b/.github/actions/kots-e2e/action.yml @@ -116,7 +116,7 @@ runs: KOTS_DOCKERHUB_USERNAME=${{ inputs.kots-dockerhub-username }} \ KOTS_DOCKERHUB_PASSWORD=${{ inputs.kots-dockerhub-password }} \ AIRGAP=${{ inputs.kots-airgap }} \ - IS_OPENSHIFT=${{ inputs.k8s-distribution == 'openshift' && 'true' || 'false' }} \ + IS_OPENSHIFT=${{ inputs.k8s-distribution == 'openshift-exp' && 'true' || 'false' }} \ SKIP_TEARDOWN=1 shell: bash diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index c7219f65ca..02f61f6bb5 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -640,7 +640,7 @@ jobs: matrix: cluster: [ {distribution: kind, version: v1.28.0}, - {distribution: openshift, version: 4.13.0-okd} + {distribution: openshift-exp, version: 4.13.0-okd} ] env: APP_SLUG: minimal-rbac @@ -1059,7 +1059,7 @@ jobs: matrix: cluster: [ {distribution: kind, version: v1.28.0}, - {distribution: openshift, version: 4.13.0-okd} + {distribution: openshift-exp, version: 4.13.0-okd} ] env: APP_SLUG: minimal-rbac @@ -3508,7 +3508,7 @@ jobs: matrix: cluster: [ {distribution: kind, version: v1.28.0}, - {distribution: openshift, version: 4.13.0-okd} + {distribution: openshift-exp, version: 4.13.0-okd} ] env: KOTS_NAMESPACE: replicated-sdk @@ -3818,7 +3818,7 @@ jobs: matrix: cluster: [ {distribution: kind, version: v1.28.0}, - {distribution: openshift, version: 4.13.0-okd} + {distribution: openshift-exp, version: 4.13.0-okd} ] steps: - name: Checkout