From 8b9dd18b3b858318820a47a5c14d9a5b0ed98198 Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Fri, 4 Sep 2020 11:22:18 -0400 Subject: [PATCH] Update ingress-nginx jobs to use promoted images --- .../kubernetes/sig-network/ingress-nginx.yaml | 51 +++++++++++++++---- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/config/jobs/kubernetes/sig-network/ingress-nginx.yaml b/config/jobs/kubernetes/sig-network/ingress-nginx.yaml index 2dc3e4bc6395..3c1894a5516c 100644 --- a/config/jobs/kubernetes/sig-network/ingress-nginx.yaml +++ b/config/jobs/kubernetes/sig-network/ingress-nginx.yaml @@ -12,7 +12,7 @@ presubmits: preset-kind-volume-mounts: "true" spec: containers: - - image: gcr.io/k8s-staging-ingress-nginx/e2e-test-runner:v20200627-ingress-nginx-2.9.0-9-ga003eabd5 + - image: k8s.gcr.io/ingress-nginx/e2e-test-runner:v20200904-gc2884a3da@sha256:f2de204dafb3951b974a53f7a4e9cc43b62b93c99b95edcb7a65afdc1d4f0bf4 command: - ./hack/verify-boilerplate.sh annotations: @@ -30,7 +30,7 @@ presubmits: preset-kind-volume-mounts: "true" spec: containers: - - image: gcr.io/k8s-staging-ingress-nginx/e2e-test-runner:v20200627-ingress-nginx-2.9.0-9-ga003eabd5 + - image: k8s.gcr.io/ingress-nginx/e2e-test-runner:v20200904-gc2884a3da@sha256:f2de204dafb3951b974a53f7a4e9cc43b62b93c99b95edcb7a65afdc1d4f0bf4 command: - ./hack/verify-codegen.sh annotations: @@ -47,7 +47,7 @@ presubmits: preset-kind-volume-mounts: "true" spec: containers: - - image: gcr.io/k8s-staging-ingress-nginx/e2e-test-runner:v20200627-ingress-nginx-2.9.0-9-ga003eabd5 + - image: k8s.gcr.io/ingress-nginx/e2e-test-runner:v20200904-gc2884a3da@sha256:f2de204dafb3951b974a53f7a4e9cc43b62b93c99b95edcb7a65afdc1d4f0bf4 command: - ./hack/verify-gofmt.sh annotations: @@ -66,7 +66,7 @@ presubmits: preset-kind-volume-mounts: "true" spec: containers: - - image: gcr.io/k8s-staging-ingress-nginx/e2e-test-runner:v20200627-ingress-nginx-2.9.0-9-ga003eabd5 + - image: k8s.gcr.io/ingress-nginx/e2e-test-runner:v20200904-gc2884a3da@sha256:f2de204dafb3951b974a53f7a4e9cc43b62b93c99b95edcb7a65afdc1d4f0bf4 command: - ./hack/verify-golint.sh annotations: @@ -83,7 +83,7 @@ presubmits: preset-kind-volume-mounts: "true" spec: containers: - - image: gcr.io/k8s-staging-ingress-nginx/e2e-test-runner:v20200627-ingress-nginx-2.9.0-9-ga003eabd5 + - image: k8s.gcr.io/ingress-nginx/e2e-test-runner:v20200904-gc2884a3da@sha256:f2de204dafb3951b974a53f7a4e9cc43b62b93c99b95edcb7a65afdc1d4f0bf4 command: - ./hack/verify-lualint.sh annotations: @@ -102,7 +102,7 @@ presubmits: preset-kind-volume-mounts: "true" spec: containers: - - image: gcr.io/k8s-staging-ingress-nginx/e2e-test-runner:v20200627-ingress-nginx-2.9.0-9-ga003eabd5 + - image: k8s.gcr.io/ingress-nginx/e2e-test-runner:v20200904-gc2884a3da@sha256:f2de204dafb3951b974a53f7a4e9cc43b62b93c99b95edcb7a65afdc1d4f0bf4 command: - ./hack/verify-chart-lint.sh annotations: @@ -121,7 +121,7 @@ presubmits: preset-kind-volume-mounts: "true" spec: containers: - - image: gcr.io/k8s-staging-ingress-nginx/e2e-test-runner:v20200627-ingress-nginx-2.9.0-9-ga003eabd5 + - image: k8s.gcr.io/ingress-nginx/e2e-test-runner:v20200904-gc2884a3da@sha256:f2de204dafb3951b974a53f7a4e9cc43b62b93c99b95edcb7a65afdc1d4f0bf4 command: - make - lua-test @@ -141,7 +141,7 @@ presubmits: preset-kind-volume-mounts: "true" spec: containers: - - image: gcr.io/k8s-staging-ingress-nginx/e2e-test-runner:v20200627-ingress-nginx-2.9.0-9-ga003eabd5 + - image: k8s.gcr.io/ingress-nginx/e2e-test-runner:v20200904-gc2884a3da@sha256:f2de204dafb3951b974a53f7a4e9cc43b62b93c99b95edcb7a65afdc1d4f0bf4 command: - /bin/bash - -c @@ -282,11 +282,42 @@ presubmits: - name: REPO_INFO value: https://github.com/kubernetes/ingress-nginx - name: K8S_VERSION - value: v1.18.2@sha256:7b27a6d0f2517ff88ba444025beae41491b016bc6af573ba467b70c5e8e0d85f + value: v1.18.8@sha256:e1f5c7e498af9d2ff8e57c30db7bd9b20f6fd0b57be3aaa3f819ba491e359a58 annotations: testgrid-dashboards: sig-network-ingress-nginx testgrid-tab-name: e2e-1-18 + - name: pull-ingress-nginx-e2e-1-19 + always_run: false + decorate: true + decoration_config: + timeout: 1h + max_concurrency: 5 + path_alias: k8s.io/ingress-nginx + #run_if_changed: '\.go$|^rootfs/' + labels: + preset-kind-volume-mounts: "true" + preset-dind-enabled: "true" + spec: + containers: + - image: gcr.io/k8s-testimages/krte:v20200824-5d057db-master + command: + - wrapper.sh + - bash + - -c + - curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz - -C "${PATH%%:*}/" && make kind-e2e-test + # docker-in-docker needs privileged mode + securityContext: + privileged: true + env: + - name: REPO_INFO + value: https://github.com/kubernetes/ingress-nginx + - name: K8S_VERSION + value: v1.19.0@sha256:3b0289b2d1bab2cb9108645a006939d2f447a10ad2bb21919c332d06b548bbc6 + annotations: + testgrid-dashboards: sig-network-ingress-nginx + testgrid-tab-name: e2e-1-19 + - name: pull-ingress-nginx-e2e-helm-chart always_run: false decorate: true @@ -313,7 +344,7 @@ presubmits: - name: REPO_INFO value: https://github.com/kubernetes/ingress-nginx - name: K8S_VERSION - value: v1.18.4@sha256:d8ff5fc405fc679dd3dd0cccc01543ba4942ed90823817d2e9e2c474a5343c4f + value: v1.19.0@sha256:3b0289b2d1bab2cb9108645a006939d2f447a10ad2bb21919c332d06b548bbc6 annotations: testgrid-dashboards: sig-network-ingress-nginx testgrid-tab-name: e2e-helm-chart