Merge #954

954: [jjo] release-1.7: Merge #952 from master branch r=jjo a=jjo Co-authored-by: David Barranco <dbarranco@vmware.com> Co-authored-by: JuanJo Ciarlante <juanjosec@gmail.com>
vmware-archive · Oct 7, 2020 · ccd0893 · ccd0893
2 parents 2f92fb4 + e8269b2
commit ccd0893
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -21,8 +21,8 @@ import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 def buildRelDefaults = [
   'AKS_REL': '1.16,1.17',
   'EKS_REL': '1.16,1.17',
-  'GKE_REL': '1.16,1.17-pre',
-  'GEN_REL': '1.16', // generic is tested on GKE, wait for 1.17 on the stable channel to change it
+  'GKE_REL': '1.16,1.17',
+  'GEN_REL': '1.17', // generic is tested on GKE, wait for 1.17 on the stable channel to change it
 ]
 
 properties([

diff --git a/jenkins/cloud-custodian/Jenkinsfile b/jenkins/cloud-custodian/Jenkinsfile
@@ -25,7 +25,7 @@ def buildRelDefaults = [
   'AKS_REL': '1.16,1.17',
   'EKS_REL': '1.16,1.17',
   'GKE_REL': '1.16,1.17',
-  'GEN_REL': '1.16',
+  'GEN_REL': '1.17',
 ]
 
 Void noLog(String cmd) {