From b43d5385421439366e9dcef094a6ebcda5c6ae02 Mon Sep 17 00:00:00 2001
From: Michael Morello <michael.morello@elastic.co>
Date: Fri, 17 Jan 2020 16:14:19 +0100
Subject: [PATCH] Remove GKE 1.12 from the e2e tests, replace it with 1.15
 (#2440)

---
 .ci/jobs/e2e-custom.yml                   |  2 +-
 build/ci/README.md                        |  2 +-
 build/ci/e2e/GKE_k8s_versions.jenkinsfile | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.ci/jobs/e2e-custom.yml b/.ci/jobs/e2e-custom.yml
index e7b5d8749e..b4369bc497 100644
--- a/.ci/jobs/e2e-custom.yml
+++ b/.ci/jobs/e2e-custom.yml
@@ -10,7 +10,7 @@
       - string:
           name: VERSION
           default: 1.13
-          description: "Kubernetes version, default is 1.12"
+          description: "Kubernetes version, default is 1.13"
       - bool:
           name: SEND_NOTIFICATIONS
           default: true
diff --git a/build/ci/README.md b/build/ci/README.md
index e5ca5a0b24..870eb94ca1 100644
--- a/build/ci/README.md
+++ b/build/ci/README.md
@@ -39,7 +39,7 @@ EOF
 cat >deployer-config.yml <<EOF
 id: gke-ci
 overrides:
-  kubernetesVersion: "1.12"
+  kubernetesVersion: "1.13"
   clusterName: $BUILD_TAG
   vaultInfo:
     address: $VAULT_ADDR
diff --git a/build/ci/e2e/GKE_k8s_versions.jenkinsfile b/build/ci/e2e/GKE_k8s_versions.jenkinsfile
index c62e457af2..627ac33d7b 100644
--- a/build/ci/e2e/GKE_k8s_versions.jenkinsfile
+++ b/build/ci/e2e/GKE_k8s_versions.jenkinsfile
@@ -28,36 +28,36 @@ pipeline {
         }
         stage('Run tests for different k8s versions in GKE') {
             parallel {
-                stage("1.12") {
+                stage("1.13") {
                     agent {
                         label 'linux'
                     }
                     steps {
                         checkout scm
                         script {
-                            runWith(lib, failedTests, '1.12', "eck-gke12-${BUILD_NUMBER}-e2e")
+                            runWith(lib, failedTests, '1.13', "eck-gke13-${BUILD_NUMBER}-e2e")
                         }
                     }
                 }
-                stage("1.13") {
+                stage("1.14") {
                     agent {
                         label 'linux'
                     }
                     steps {
                         checkout scm
                         script {
-                            runWith(lib, failedTests, '1.13', "eck-gke13-${BUILD_NUMBER}-e2e")
+                            runWith(lib, failedTests, '1.14', "eck-gke14-${BUILD_NUMBER}-e2e")
                         }
                     }
                 }
-                stage("1.14") {
+                stage("1.15") {
                     agent {
                         label 'linux'
                     }
                     steps {
                         checkout scm
                         script {
-                            runWith(lib, failedTests, '1.14', "eck-gke14-${BUILD_NUMBER}-e2e")
+                            runWith(lib, failedTests, '1.15', "eck-gke15-${BUILD_NUMBER}-e2e")
                         }
                     }
                 }
@@ -83,7 +83,7 @@ pipeline {
         }
         cleanup {
             script {
-                clusters = ["eck-gke12-${BUILD_NUMBER}-e2e", "eck-gke13-${BUILD_NUMBER}-e2e", "eck-gke14-${BUILD_NUMBER}-e2e"]
+                clusters = ["eck-gke13-${BUILD_NUMBER}-e2e", "eck-gke14-${BUILD_NUMBER}-e2e", "eck-gke15-${BUILD_NUMBER}-e2e"]
                 for (int i = 0; i < clusters.size(); i++) {
                     build job: 'cloud-on-k8s-e2e-cleanup',
                         parameters: [string(name: 'GKE_CLUSTER', value: clusters[i])],