From 30ea7edbe06c84c3ae78cfa89e5c8657b1439b9a Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Thu, 5 Nov 2020 17:10:13 -0700 Subject: [PATCH] ci: enable the builds to run back to 1.11 The CI in the release branch should run back to k8s v1.11 until we officially remove support for that version. Signed-off-by: Travis Nielsen --- Jenkinsfile | 9 +++++---- tests/integration/ceph_base_deploy_test.go | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9c08139f9..caf8e2769 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -154,11 +154,12 @@ pipeline { stash name: 'repo-amd64',includes: 'ceph-amd64.tar,cockroachdb-amd64.tar,cassandra-amd64.tar,nfs-amd64.tar,yugabytedb-amd64.tar,build/common.sh,_output/tests/linux_amd64/,_output/charts/,tests/scripts/' script { def data = [ + "aws_1.11.x": "v1.11.10", + "aws_1.13.x": "v1.13.12", "aws_1.15.x": "v1.15.12", - "aws_1.16.x": "v1.16.15", - "aws_1.17.x": "v1.17.9", - "aws_1.18.x": "v1.18.6", - "aws_1.19.x": "v1.19.0" + "aws_1.17.x": "v1.17.13", + "aws_1.18.x": "v1.18.10", + "aws_1.19.x": "v1.19.3" ] testruns = [:] for (kv in mapToList(data)) { diff --git a/tests/integration/ceph_base_deploy_test.go b/tests/integration/ceph_base_deploy_test.go index 5971a707c..10666760a 100644 --- a/tests/integration/ceph_base_deploy_test.go +++ b/tests/integration/ceph_base_deploy_test.go @@ -40,12 +40,12 @@ const ( // These versions are for running a minimal test suite for more efficient tests across different versions of K8s // instead of running all suites on all versions // To run on multiple versions, add a comma separate list such as 1.16.0,1.17.0 - flexDriverMinimalTestVersion = "1.15.0" - cephMasterSuiteMinimalTestVersion = "1.16.0" - multiClusterMinimalTestVersion = "1.16.0" + flexDriverMinimalTestVersion = "1.11.0" + cephMasterSuiteMinimalTestVersion = "1.12.0" + multiClusterMinimalTestVersion = "1.15.0" helmMinimalTestVersion = "1.17.0" upgradeMinimalTestVersion = "1.18.0" - smokeSuiteMinimalTestVersion = "1.19.0" + smokeSuiteMinimalTestVersion = "1.13.0,1.19.0" ) var (