diff --git a/.github/workflows/integration-test-flex-suite.yaml b/.github/workflows/integration-test-flex-suite.yaml index 1da48ff6d..f16cbb268 100644 --- a/.github/workflows/integration-test-flex-suite.yaml +++ b/.github/workflows/integration-test-flex-suite.yaml @@ -76,7 +76,7 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.15.12','v1.16.15','v1.18.15','v1.19.7','v1.20.2'] + kubernetes-versions : ['v1.15.12','v1.18.15','v1.20.5','v1.21.0'] steps: - name: checkout uses: actions/checkout@v2 diff --git a/.github/workflows/integration-test-helm-suite.yaml b/.github/workflows/integration-test-helm-suite.yaml index 8d2fa14e2..90d613323 100644 --- a/.github/workflows/integration-test-helm-suite.yaml +++ b/.github/workflows/integration-test-helm-suite.yaml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.15.12', 'v1.20.2'] + kubernetes-versions : ['v1.15.12', 'v1.21.0'] steps: - name: checkout uses: actions/checkout@v2 @@ -82,7 +82,7 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.15.12','v1.16.15','v1.18.15','v1.19.7','v1.20.2'] + kubernetes-versions : ['v1.15.12','v1.18.15','v1.20.5','v1.21.0'] steps: - name: checkout uses: actions/checkout@v2 diff --git a/.github/workflows/integration-test-mgr-suite.yaml b/.github/workflows/integration-test-mgr-suite.yaml index 487ddbbc5..94326bf94 100644 --- a/.github/workflows/integration-test-mgr-suite.yaml +++ b/.github/workflows/integration-test-mgr-suite.yaml @@ -7,7 +7,7 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.20.2'] + kubernetes-versions : ['v1.21.0'] steps: - name: checkout uses: actions/checkout@v2 diff --git a/.github/workflows/integration-test-multi-cluster-suite.yaml b/.github/workflows/integration-test-multi-cluster-suite.yaml index de9152d57..5190b77ac 100644 --- a/.github/workflows/integration-test-multi-cluster-suite.yaml +++ b/.github/workflows/integration-test-multi-cluster-suite.yaml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.20.2'] + kubernetes-versions : ['v1.21.0'] steps: - name: checkout uses: actions/checkout@v2 @@ -81,7 +81,7 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.15.12','v1.16.15','v1.18.15','v1.19.7','v1.20.2'] + kubernetes-versions : ['v1.15.12','v1.18.15','v1.20.5','v1.21.0'] steps: - name: checkout uses: actions/checkout@v2 diff --git a/.github/workflows/integration-test-smoke-suite.yaml b/.github/workflows/integration-test-smoke-suite.yaml index 0a55445ac..2fedcdf27 100644 --- a/.github/workflows/integration-test-smoke-suite.yaml +++ b/.github/workflows/integration-test-smoke-suite.yaml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.15.12', 'v1.20.2'] + kubernetes-versions : ['v1.15.12', 'v1.21.0'] steps: - name: checkout uses: actions/checkout@v2 @@ -80,7 +80,7 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.15.12','v1.16.15','v1.18.15','v1.19.7','v1.20.2'] + kubernetes-versions : ['v1.15.12','v1.18.15','v1.20.5','v1.21.0'] steps: - name: checkout uses: actions/checkout@v2 diff --git a/.github/workflows/integration-test-upgrade-suite.yaml b/.github/workflows/integration-test-upgrade-suite.yaml index aee6de410..f3f25e5e1 100644 --- a/.github/workflows/integration-test-upgrade-suite.yaml +++ b/.github/workflows/integration-test-upgrade-suite.yaml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.20.2'] + kubernetes-versions : ['v1.21.0'] steps: - name: checkout uses: actions/checkout@v2 @@ -80,7 +80,7 @@ jobs: strategy: fail-fast: false matrix: - kubernetes-versions : ['v1.15.12','v1.16.15','v1.18.15','v1.19.7','v1.20.2'] + kubernetes-versions : ['v1.15.12','v1.18.15','v1.20.5','v1.21.0'] steps: - name: checkout uses: actions/checkout@v2 diff --git a/.mergify.yml b/.mergify.yml index 29b4a1461..9546559c3 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -135,11 +135,11 @@ pull_request_rules: - 'check-success=encryption-pvc-db-wal' - 'check-success=encryption-pvc-kms-vault-token-auth' - 'check-success=TestCephSmokeSuite (v1.15.12)' - - 'check-success=TestCephSmokeSuite (v1.20.2)' + - 'check-success=TestCephSmokeSuite (v1.21.0)' - 'check-success=TestCephHelmSuite (v1.15.12)' - - 'check-success=TestCephHelmSuite (v1.20.2)' - - 'check-success=TestCephMultiClusterDeploySuite (v1.20.2)' - - 'check-success=TestCephUpgradeSuite (v1.20.2)' + - 'check-success=TestCephHelmSuite (v1.21.0)' + - 'check-success=TestCephMultiClusterDeploySuite (v1.21.0)' + - 'check-success=TestCephUpgradeSuite (v1.21.0)' actions: merge: method: merge diff --git a/Jenkinsfile b/Jenkinsfile index 8fbe2c099..9293c8ce7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -156,8 +156,8 @@ pipeline { "aws_1.15.x": "v1.15.12", "aws_1.16.x": "v1.16.15", "aws_1.18.x": "v1.18.12", - "aws_1.19.x": "v1.19.4", - "aws_1.20.x": "v1.20.0" + "aws_1.20.x": "v1.20.5", + "aws_1.21.x": "v1.21.0" ] testruns = [:] for (kv in mapToList(data)) {