Fix branch names for master pipeline

config/jobs/kubernetes/kops/build-pipeline.py

@@ -73,8 +73,8 @@ def expand(s):
         return s.format(**subs)
 
     if branch == 'master':
-        extract = "release/latest"
-        e2e_image = "gcr.io/k8s-testimages/kubekins-e2e:v20200623-2424179-master"
+        extract = "release/latest-1.19"
+        e2e_image = "gcr.io/k8s-testimages/kubekins-e2e:v20200623-2424179-1.19"
     else:
         extract = expand("release/stable-{k8s_version}")
         # Hack to stop the autobumper getting confused
@@ -122,7 +122,7 @@ def generate():
     print("# Test scenarios generated by build-pipeline.py (do not manually edit)")
     print("periodics:")
     for branch in branches:
-        k8s_version = "latest" if branch == "master" else branch
+        k8s_version = "1.19" if branch == "master" else branch
         ssh_user = "admin" if branch in ("1.16", "1.17") else "ubuntu"
         build_tests(branch=branch, k8s_version=k8s_version, ssh_user=ssh_user)
 

config/jobs/kubernetes/kops/kops-pipeline.yaml

@@ -1,7 +1,7 @@
 # Test scenarios generated by build-pipeline.py (do not manually edit)
 periodics:
 
-# {"branch": "master", "k8s_version": "latest"}
+# {"branch": "master", "k8s_version": "1.19"}
 # Verify the latest-ci version from the master branch of kops
 # Runs a small subset of the e2e tests.
 # Publishes the version to latest-ci-updown-green on success.
@@ -16,7 +16,7 @@ periodics:
     preset-aws-credential: "true"
   spec:
     containers:
-    - image: gcr.io/k8s-testimages/kubekins-e2e:v20200623-2424179-master
+    - image: gcr.io/k8s-testimages/kubekins-e2e:v20200623-2424179-1.19
       command:
       - runner.sh
       - kubetest
@@ -34,7 +34,7 @@ periodics:
       - --cluster=e2e-kops-pipeline-updown-kopsmaster.test-cncf-aws.k8s.io
       - --kops-ssh-user=ubuntu
       - --kops-nodes=4
-      - --extract=release/latest
+      - --extract=release/latest-1.19
       - --kops-state=s3://k8s-kops-prow/
       - --kops-ssh-key=$(AWS_SSH_PRIVATE_KEY_FILE)
       - --kops-ssh-public-key=$(AWS_SSH_PUBLIC_KEY_FILE)
@@ -46,7 +46,7 @@ periodics:
       - --test_args=--ginkgo.focus=\[k8s.io\]\sNetworking.*\[Conformance\] --ginkgo.skip=\[Slow\]|\[Serial\]
       - --ginkgo-parallel
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-kops, google-aws, kops-misc, kops-k8s-latest
+    testgrid-dashboards: sig-cluster-lifecycle-kops, google-aws, kops-misc, kops-k8s-1.19
     testgrid-tab-name: kops-pipeline-updown-master
 
 # {"branch": "1.16", "k8s_version": "1.16"}

config/testgrids/kubernetes/kops/config.yaml

@@ -21,6 +21,7 @@ dashboard_groups:
   - kops-k8s-1.16
   - kops-k8s-1.17
   - kops-k8s-1.18
+  - kops-k8s-1.19
   - kops-k8s-latest
 
 dashboards:
@@ -44,4 +45,5 @@ dashboards:
 - name: kops-k8s-1.16
 - name: kops-k8s-1.17
 - name: kops-k8s-1.18
+- name: kops-k8s-1.19
 - name: kops-k8s-latest