Merge pull request #11883 from Random-Liu/add-shielded-cos-test

Add validation for shielded cos + containerd 1.2 + k8s 1.13.

config/jobs/kubernetes/sig-node/containerd.yaml

@@ -997,3 +997,86 @@ periodics:
       env:
       - name: GOPATH
         value: /go
+
+- interval: 1h
+  name: ci-containerd-e2e-shielded-gci-gce-1-2
+  labels:
+    preset-service-account: "true"
+    preset-k8s-ssh: "true"
+    preset-e2e-containerd: "true"
+  spec:
+    containers:
+    - args:
+      - --repo=github.com/containerd/cri=release/1.2
+      - --timeout=70
+      - --scenario=kubernetes_e2e
+      - --
+      - --check-leaked-resources
+      - --env=KUBE_MASTER_EXTRA_METADATA=user-data=/workspace/github.com/containerd/cri/test/e2e/master.yaml,containerd-configure-sh=/workspace/github.com/containerd/cri/cluster/gce/configure.sh,containerd-env=/workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.2/env
+      - --env=KUBE_NODE_EXTRA_METADATA=user-data=/workspace/github.com/containerd/cri/test/e2e/node.yaml,containerd-configure-sh=/workspace/github.com/containerd/cri/cluster/gce/configure.sh,containerd-env=/workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.2/env
+      - --env=PREPULL_E2E_IMAGES=false
+      - --env=ENABLE_POD_SECURITY_POLICY=true
+      - --extract=ci/latest-1.13
+      - --gcp-node-image=gci
+      - --gcp-nodes=4
+      - --gcp-zone=us-west1-b
+      - --image-family=cos-shielded-lts-1
+      - --image-project=gke-node-images-test
+      - --ginkgo-parallel=30
+      - --provider=gce
+      - --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
+      - --timeout=50m
+      image: gcr.io/k8s-testimages/kubekins-e2e:v20190315-49d62eb51-1.13
+
+- interval: 1h
+  name: ci-containerd-e2e-shielded-gci-gce-slow-1-2
+  labels:
+    preset-service-account: "true"
+    preset-k8s-ssh: "true"
+    preset-e2e-containerd: "true"
+  spec:
+    containers:
+    - args:
+      - --repo=github.com/containerd/cri=release/1.2
+      - --timeout=170
+      - --scenario=kubernetes_e2e
+      - --
+      - --check-leaked-resources
+      - --env=KUBE_MASTER_EXTRA_METADATA=user-data=/workspace/github.com/containerd/cri/test/e2e/master.yaml,containerd-configure-sh=/workspace/github.com/containerd/cri/cluster/gce/configure.sh,containerd-env=/workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.2/env
+      - --env=KUBE_NODE_EXTRA_METADATA=user-data=/workspace/github.com/containerd/cri/test/e2e/node.yaml,containerd-configure-sh=/workspace/github.com/containerd/cri/cluster/gce/configure.sh,containerd-env=/workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.2/env
+      - --extract=ci/latest-1.13
+      - --gcp-node-image=gci
+      - --gcp-zone=us-west1-b
+      - --image-family=cos-shielded-lts-1
+      - --image-project=gke-node-images-test
+      - --ginkgo-parallel=25
+      - --provider=gce
+      - --test_args=--ginkgo.focus=\[Slow\] --ginkgo.skip=\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
+      - --timeout=150m
+      image: gcr.io/k8s-testimages/kubekins-e2e:v20190315-49d62eb51-1.13
+
+- interval: 1h
+  name: ci-containerd-e2e-shielded-gci-gce-serial-1-2
+  labels:
+    preset-service-account: "true"
+    preset-k8s-ssh: "true"
+    preset-e2e-containerd: "true"
+  spec:
+    containers:
+    - args:
+      - --repo=github.com/containerd/cri=release/1.2
+      - --timeout=520
+      - --scenario=kubernetes_e2e
+      - --
+      - --check-leaked-resources
+      - --env=KUBE_MASTER_EXTRA_METADATA=user-data=/workspace/github.com/containerd/cri/test/e2e/master.yaml,containerd-configure-sh=/workspace/github.com/containerd/cri/cluster/gce/configure.sh,containerd-env=/workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.2/env
+      - --env=KUBE_NODE_EXTRA_METADATA=user-data=/workspace/github.com/containerd/cri/test/e2e/node.yaml,containerd-configure-sh=/workspace/github.com/containerd/cri/cluster/gce/configure.sh,containerd-env=/workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.2/env
+      - --extract=ci/latest-1.13
+      - --gcp-node-image=gci
+      - --gcp-zone=us-west1-b
+      - --image-family=cos-shielded-lts-1
+      - --image-project=gke-node-images-test
+      - --provider=gce
+      - --test_args=--ginkgo.focus=\[Serial\]|\[Disruptive\] --ginkgo.skip=\[Flaky\]|\[Feature:.+\] --minStartupPods=8
+      - --timeout=500m
+      image: gcr.io/k8s-testimages/kubekins-e2e:v20190315-49d62eb51-1.13

testgrid/config.yaml

@@ -149,6 +149,12 @@ test_groups:
   gcs_prefix: kubernetes-jenkins/logs/ci-containerd-e2e-gci-gce-1-1
 - name: ci-containerd-e2e-gci-gce-1-2
   gcs_prefix: kubernetes-jenkins/logs/ci-containerd-e2e-gci-gce-1-2
+- name: ci-containerd-e2e-shielded-gci-gce-1-2
+  gcs_prefix: kubernetes-jenkins/logs/ci-containerd-e2e-shielded-gci-gce-1-2
+- name: ci-containerd-e2e-shielded-gci-gce-slow-1-2
+  gcs_prefix: kubernetes-jenkins/logs/ci-containerd-e2e-shielded-gci-gce-slow-1-2
+- name: ci-containerd-e2e-shielded-gci-gce-serial-1-2
+  gcs_prefix: kubernetes-jenkins/logs/ci-containerd-e2e-shielded-gci-gce-serial-1-2
 - name: ci-containerd-e2e-ubuntu-gce
   gcs_prefix: kubernetes-jenkins/logs/ci-containerd-e2e-ubuntu-gce
 - name: ci-cri-containerd-node-e2e
@@ -6502,6 +6508,12 @@ dashboards:
     test_group_name: ci-containerd-e2e-gci-gce-1-1
   - name: containerd-e2e-gci-1.2
     test_group_name: ci-containerd-e2e-gci-gce-1-2
+  - name: containerd-e2e-shielded-gci-1.2
+    test_group_name: ci-containerd-e2e-shielded-gci-gce-1-2
+  - name: containerd-e2e-shielded-gci-slow-1.2
+    test_group_name: ci-containerd-e2e-shielded-gci-gce-slow-1-2
+  - name: containerd-e2e-shielded-gci-serial-1.2
+    test_group_name: ci-containerd-e2e-shielded-gci-gce-serial-1-2
   - name: containerd-e2e-ubuntu
     test_group_name: ci-containerd-e2e-ubuntu-gce
   - name: e2e-gci-reboot