From 80be5b5fc0c63edb0fa3eeec73db41e36e5a29d8 Mon Sep 17 00:00:00 2001 From: subhamkrai Date: Thu, 1 Sep 2022 11:28:14 +0530 Subject: [PATCH] ci: remove older k8s config since we moved to 1.19 no need of using older config to setup older k8s since we moved to 1.19 as min k8s version. Signed-off-by: subhamkrai --- .../action.yaml | 38 ------------------ .../integration-test-helm-suite.yaml | 20 +--------- .../integration-test-object-suite.yaml | 20 +--------- .../integration-test-smoke-suite.yaml | 22 +---------- .../integration-test-upgrade-suite.yaml | 24 ++---------- .../integration-tests-on-release.yaml | 39 ++++++------------- 6 files changed, 18 insertions(+), 145 deletions(-) delete mode 100644 .github/workflows/integration-test-config-older-k8s/action.yaml diff --git a/.github/workflows/integration-test-config-older-k8s/action.yaml b/.github/workflows/integration-test-config-older-k8s/action.yaml deleted file mode 100644 index e75518a47..000000000 --- a/.github/workflows/integration-test-config-older-k8s/action.yaml +++ /dev/null @@ -1,38 +0,0 @@ -name: Cluster Setup -description: Cluster setup for integration test -inputs: - kubernetes-version: - description: kubernetes version to use for the workflow - required: true - github-token: - description: GITHUB_TOKEN from the calling workflow - required: true - -runs: - using: "composite" - steps: - - name: setup golang - uses: actions/setup-go@v2 - with: - go-version: 1.18 - - - name: setup minikube - uses: manusa/actions-setup-minikube@v2.6.1 - with: - minikube version: "v1.24.0" - kubernetes version: ${{ inputs.kubernetes-version }} - start args: --memory 6g --cpus=2 --addons ingress - github token: ${{ inputs.github-token }} - - - name: print k8s cluster status - shell: bash --noprofile --norc -eo pipefail -x {0} - run: tests/scripts/github-action-helper.sh print_k8s_cluster_status - - # This step is required for all the integration tests except the canary tests - - name: use local disk - shell: bash --noprofile --norc -eo pipefail -x {0} - run: tests/scripts/github-action-helper.sh use_local_disk_for_integration_test - - - name: build rook - shell: bash --noprofile --norc -eo pipefail -x {0} - run: tests/scripts/github-action-helper.sh build_rook diff --git a/.github/workflows/integration-test-helm-suite.yaml b/.github/workflows/integration-test-helm-suite.yaml index 593252ada..126262225 100644 --- a/.github/workflows/integration-test-helm-suite.yaml +++ b/.github/workflows/integration-test-helm-suite.yaml @@ -22,37 +22,19 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.19.16', 'v1.25.0'] + kubernetes-versions: ["v1.19.16", "v1.25.0"] steps: - name: checkout uses: actions/checkout@v2 with: fetch-depth: 0 - - name: check matrix k8s version - run: | - echo USE_K8S=$(echo ${{ matrix.kubernetes-versions }}) - if [ $(echo ${{ matrix.kubernetes-versions }}) == "v1.19.16" ]; then - echo "OLDER_K8S=true" >> $GITHUB_ENV - else - echo "OLDER_K8S=false" >> $GITHUB_ENV - fi - echo env.OLDER_K8S - - name: setup latest cluster resources - if: ${{ env.OLDER_K8S == 'false' }} uses: ./.github/workflows/integration-test-config-latest-k8s with: github-token: ${{ secrets.GITHUB_TOKEN }} kubernetes-version: ${{ matrix.kubernetes-versions }} - - name: setup older cluster resources - if: ${{ env.OLDER_K8S == 'true' }} - uses: ./.github/workflows/integration-test-config-older-k8s - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - kubernetes-version: ${{ matrix.kubernetes-versions }} - - name: remove read permission from kube config file run: sudo chmod go-r ~/.kube/config diff --git a/.github/workflows/integration-test-object-suite.yaml b/.github/workflows/integration-test-object-suite.yaml index df7a0f3d1..ad74942ef 100644 --- a/.github/workflows/integration-test-object-suite.yaml +++ b/.github/workflows/integration-test-object-suite.yaml @@ -22,37 +22,19 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.19.16', 'v1.25.0'] + kubernetes-versions: ["v1.19.16", "v1.25.0"] steps: - name: checkout uses: actions/checkout@v2 with: fetch-depth: 0 - - name: check matrix k8s version - run: | - echo USE_K8S=$(echo ${{ matrix.kubernetes-versions }}) - if [ $(echo ${{ matrix.kubernetes-versions }}) == "v1.19.16" ]; then - echo "OLDER_K8S=true" >> $GITHUB_ENV - else - echo "OLDER_K8S=false" >> $GITHUB_ENV - fi - echo env.OLDER_K8S - - name: setup latest cluster resources - if: ${{ env.OLDER_K8S == 'false' }} uses: ./.github/workflows/integration-test-config-latest-k8s with: github-token: ${{ secrets.GITHUB_TOKEN }} kubernetes-version: ${{ matrix.kubernetes-versions }} - - name: setup older cluster resources - if: ${{ env.OLDER_K8S == 'true' }} - uses: ./.github/workflows/integration-test-config-older-k8s - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - kubernetes-version: ${{ matrix.kubernetes-versions }} - - name: TestCephObjectSuite run: | tests/scripts/github-action-helper.sh collect_udev_logs_in_background diff --git a/.github/workflows/integration-test-smoke-suite.yaml b/.github/workflows/integration-test-smoke-suite.yaml index 2bf836d40..9156d7b5c 100644 --- a/.github/workflows/integration-test-smoke-suite.yaml +++ b/.github/workflows/integration-test-smoke-suite.yaml @@ -22,33 +22,15 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.19.16', 'v1.25.0'] + kubernetes-versions: ["v1.19.16", "v1.25.0"] steps: - name: checkout uses: actions/checkout@v2 with: fetch-depth: 0 - - name: check matrix k8s version - run: | - echo USE_K8S=$(echo ${{ matrix.kubernetes-versions }}) - if [ $(echo ${{ matrix.kubernetes-versions }}) == "v1.19.16" ]; then - echo "OLDER_K8S=true" >> $GITHUB_ENV - else - echo "OLDER_K8S=false" >> $GITHUB_ENV - fi - echo env.OLDER_K8S - - - name: setup latest cluster resources - if: ${{ env.OLDER_K8S == 'false' }} - uses: ./.github/workflows/integration-test-config-latest-k8s - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - kubernetes-version: ${{ matrix.kubernetes-versions }} - - name: setup older cluster resources - if: ${{ env.OLDER_K8S == 'true' }} - uses: ./.github/workflows/integration-test-config-older-k8s + uses: ./.github/workflows/integration-test-config-latest-k8s with: github-token: ${{ secrets.GITHUB_TOKEN }} kubernetes-version: ${{ matrix.kubernetes-versions }} diff --git a/.github/workflows/integration-test-upgrade-suite.yaml b/.github/workflows/integration-test-upgrade-suite.yaml index 105cf0532..7d8382e9c 100644 --- a/.github/workflows/integration-test-upgrade-suite.yaml +++ b/.github/workflows/integration-test-upgrade-suite.yaml @@ -22,33 +22,15 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.19.16', 'v1.25.0'] + kubernetes-versions: ["v1.19.16", "v1.25.0"] steps: - name: checkout uses: actions/checkout@v2 with: fetch-depth: 0 - - name: check matrix k8s version - run: | - echo USE_K8S=$(echo ${{ matrix.kubernetes-versions }}) - if [ $(echo ${{ matrix.kubernetes-versions }}) == "v1.19.16" ]; then - echo "OLDER_K8S=true" >> $GITHUB_ENV - else - echo "OLDER_K8S=false" >> $GITHUB_ENV - fi - echo env.OLDER_K8S - - - name: setup latest cluster resources - if: ${{ env.OLDER_K8S == 'false' }} - uses: ./.github/workflows/integration-test-config-latest-k8s - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - kubernetes-version: ${{ matrix.kubernetes-versions }} - - name: setup older cluster resources - if: ${{ env.OLDER_K8S == 'true' }} - uses: ./.github/workflows/integration-test-config-older-k8s + uses: ./.github/workflows/integration-test-config-latest-k8s with: github-token: ${{ secrets.GITHUB_TOKEN }} kubernetes-version: ${{ matrix.kubernetes-versions }} @@ -85,7 +67,7 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.19.16', 'v1.25.0'] + kubernetes-versions: ["v1.19.16", "v1.25.0"] steps: - name: checkout uses: actions/checkout@v2 diff --git a/.github/workflows/integration-tests-on-release.yaml b/.github/workflows/integration-tests-on-release.yaml index 5e8716d68..879d1bcbe 100644 --- a/.github/workflows/integration-tests-on-release.yaml +++ b/.github/workflows/integration-tests-on-release.yaml @@ -18,33 +18,16 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.19.16','v1.21.14','v1.23.10','v1.25.0'] + kubernetes-versions: ["v1.19.16", "v1.21.14", "v1.23.10", "v1.25.0"] steps: - name: checkout uses: actions/checkout@v2 with: fetch-depth: 0 - - name: check matrix k8s version - run: | - echo USE_K8S=$(echo ${{ matrix.kubernetes-versions }}) - if [ $(echo ${{ matrix.kubernetes-versions }}) == "v1.19.16" ]; then - echo "OLDER_K8S=true" >> $GITHUB_ENV - else - echo "OLDER_K8S=false" >> $GITHUB_ENV - fi - echo env.OLDER_K8S - - - name: setup latest cluster resources - if: ${{ env.OLDER_K8S == 'false' }} - uses: ./.github/workflows/integration-test-config-latest-k8s - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - kubernetes-version: ${{ matrix.kubernetes-versions }} - - name: setup older cluster resources if: ${{ env.OLDER_K8S == 'true' }} - uses: ./.github/workflows/integration-test-config-older-k8s + uses: ./.github/workflows/integration-test-config-latest-k8s with: github-token: ${{ secrets.GITHUB_TOKEN }} kubernetes-version: ${{ matrix.kubernetes-versions }} @@ -77,7 +60,7 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.19.16','v1.21.14','v1.23.10','v1.25.0'] + kubernetes-versions: ["v1.19.16", "v1.21.14", "v1.23.10", "v1.25.0"] steps: - name: checkout uses: actions/checkout@v2 @@ -103,7 +86,7 @@ jobs: - name: setup older cluster resources if: ${{ env.OLDER_K8S == 'true' }} - uses: ./.github/workflows/integration-test-config-older-k8s + uses: ./.github/workflows/integration-test-config-latest-k8s with: github-token: ${{ secrets.GITHUB_TOKEN }} kubernetes-version: ${{ matrix.kubernetes-versions }} @@ -135,7 +118,7 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.19.16','v1.21.14','v1.23.10','v1.25.0'] + kubernetes-versions: ["v1.19.16", "v1.21.14", "v1.23.10", "v1.25.0"] steps: - name: checkout uses: actions/checkout@v2 @@ -161,7 +144,7 @@ jobs: - name: setup older cluster resources if: ${{ env.OLDER_K8S == 'true' }} - uses: ./.github/workflows/integration-test-config-older-k8s + uses: ./.github/workflows/integration-test-config-latest-k8s with: github-token: ${{ secrets.GITHUB_TOKEN }} kubernetes-version: ${{ matrix.kubernetes-versions }} @@ -192,7 +175,7 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.19.16','v1.21.14','v1.23.10','v1.25.0'] + kubernetes-versions: ["v1.19.16", "v1.21.14", "v1.23.10", "v1.25.0"] steps: - name: checkout uses: actions/checkout@v2 @@ -218,7 +201,7 @@ jobs: - name: setup older cluster resources if: ${{ env.OLDER_K8S == 'true' }} - uses: ./.github/workflows/integration-test-config-older-k8s + uses: ./.github/workflows/integration-test-config-latest-k8s with: github-token: ${{ secrets.GITHUB_TOKEN }} kubernetes-version: ${{ matrix.kubernetes-versions }} @@ -249,7 +232,7 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.19.16','v1.23.10','v1.25.0'] + kubernetes-versions: ["v1.19.16", "v1.23.10", "v1.25.0"] steps: - name: checkout uses: actions/checkout@v2 @@ -292,7 +275,7 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.19.16','v1.25.0'] + kubernetes-versions: ["v1.19.16", "v1.25.0"] steps: - name: checkout uses: actions/checkout@v2 @@ -318,7 +301,7 @@ jobs: - name: setup older cluster resources if: ${{ env.OLDER_K8S == 'true' }} - uses: ./.github/workflows/integration-test-config-older-k8s + uses: ./.github/workflows/integration-test-config-latest-k8s with: github-token: ${{ secrets.GITHUB_TOKEN }} kubernetes-version: ${{ matrix.kubernetes-versions }}