Merge pull request #26907 from justinsb/test_on_gcp

kops: Add test job for all PRs, on GCE
kubernetes · Aug 25, 2022 · 2209021 · 2209021
2 parents 0351848 + cd25300
commit 2209021
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 1 deletion.
diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py
@@ -1031,6 +1031,16 @@ def generate_presubmits_e2e():
             tab_name='e2e-containerd',
             always_run=True,
         ),
+        presubmit_test(
+            cloud='gce',
+            k8s_version='stable',
+            kops_channel='alpha',
+            name='pull-kops-e2e-k8s-gce-cilium',
+            networking='cilium',
+            tab_name='e2e-gce-cilium',
+            always_run=True,
+            extra_flags=["--gce-service-account=default"], # Workaround for test-infra#24747
+        ),
         presubmit_test(
             cloud='gce',
             k8s_version='stable',

diff --git a/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml b/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml
@@ -1,5 +1,5 @@
 # Test jobs generated by build_jobs.py (do not manually edit)
-# 26 jobs
+# 27 jobs
 presubmits:
   kubernetes/kops:
 
@@ -269,6 +269,69 @@ presubmits:
       testgrid-days-of-results: '90'
       testgrid-tab-name: e2e-containerd
 
+# {"cloud": "gce", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--gce-service-account=default", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"}
+  - name: pull-kops-e2e-k8s-gce-cilium
+    branches:
+    - master
+    always_run: true
+    optional: false
+    skip_report: false
+    labels:
+      preset-k8s-ssh: "true"
+    decorate: true
+    decoration_config:
+      timeout: 90m
+    path_alias: k8s.io/kops
+    spec:
+      serviceAccountName: k8s-kops-test
+      containers:
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20220722-16ae0286c2-master
+        imagePullPolicy: Always
+        command:
+        - runner.sh
+        args:
+        - bash
+        - -c
+        - |
+            make test-e2e-install
+            kubetest2 kops \
+            -v 2 \
+            --up --build --down \
+            --cloud-provider=gce \
+            --create-args="--channel=alpha --networking=cilium --container-runtime=containerd --gce-service-account=default" \
+            --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable.txt \
+            --kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/linux/amd64/kops \
+            --test=kops \
+            -- \
+            --ginkgo-args="--debug" \
+            --test-args="-test.timeout=60m -num-nodes=0" \
+            --test-package-marker=stable.txt \
+            --parallel=25
+        securityContext:
+          privileged: true
+        env:
+        - name: KUBE_SSH_KEY_PATH
+          value: /etc/ssh-key-secret/ssh-private
+        - name: KUBE_SSH_USER
+          value: prow
+        - name: GOPATH
+          value: /home/prow/go
+        resources:
+          requests:
+            cpu: "2"
+            memory: "6Gi"
+    annotations:
+      test.kops.k8s.io/cloud: gce
+      test.kops.k8s.io/container_runtime: containerd
+      test.kops.k8s.io/distro: u2004
+      test.kops.k8s.io/extra_flags: --gce-service-account=default
+      test.kops.k8s.io/k8s_version: stable
+      test.kops.k8s.io/kops_channel: alpha
+      test.kops.k8s.io/networking: cilium
+      testgrid-dashboards: kops-presubmits, presubmits-kops, sig-cluster-lifecycle-kops
+      testgrid-days-of-results: '90'
+      testgrid-tab-name: e2e-gce-cilium
+
 # {"cloud": "gce", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--gce-service-account=default", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"}
   - name: pull-kops-e2e-k8s-gce
     branches: