diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.17.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.17.yaml index 70fb0fe3d292..f5b1e283822a 100644 --- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.17.yaml +++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.17.yaml @@ -336,23 +336,25 @@ periodics: preset-dind-enabled: "true" preset-service-account: "true" name: ci-kubernetes-integration-beta + decorate: true + extra_refs: + - org: kubernetes + repo: kubernetes + base_ref: release-1.17 + path_alias: k8s.io/kubernetes spec: containers: - - args: - - --repo=k8s.io/kubernetes=release-1.17 - - --timeout=100 - - --scenario=kubernetes_verify - - -- - - --branch=release-1.17 - - --force - - --prow - image: gcr.io/k8s-testimages/bootstrap:v20191021-5489305 - name: "" - resources: - requests: - cpu: "4" + - image: gcr.io/k8s-testimages/kubekins-e2e:v20191106-09649c7-1.17 + command: + - runner.sh + args: + - ./hack/jenkins/test-dockerized.sh + # docker-in-docker needs privileged mode securityContext: privileged: true + resources: + requests: + cpu: 4 - annotations: fork-per-release-generic-suffix: "true" fork-per-release-periodic-interval: 2h 6h 24h diff --git a/config/jobs/kubernetes/sig-testing/integration.yaml b/config/jobs/kubernetes/sig-testing/integration.yaml index 9a5823fd1acf..00e2d3c72699 100644 --- a/config/jobs/kubernetes/sig-testing/integration.yaml +++ b/config/jobs/kubernetes/sig-testing/integration.yaml @@ -2,9 +2,11 @@ presubmits: kubernetes/kubernetes: - name: pull-kubernetes-integration always_run: true - skip_branches: + branches: # we migrated to podutils for v1.17+ - - master + - release-1.16 + - release-1.15 + - release-1.14 labels: preset-service-account: "true" preset-dind-enabled: "true" @@ -27,23 +29,46 @@ presubmits: resources: requests: cpu: 4 + # this replaces the bootstrap / scenario based job going forward + - name: pull-kubernetes-integration + always_run: true + decorate: true + skip_branches: + - release-\d+.\d+ # per-release job annotations: + fork-per-release: "true" testgrid-num-failures-to-alert: '10' testgrid-alert-stale-results-hours: '24' testgrid-create-test-group: 'true' - # this replaces the bootstrap / scenario based job going forward + path_alias: k8s.io/kubernetes + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + spec: + containers: + - image: gcr.io/k8s-testimages/kubekins-e2e:v20191106-09649c7-master + command: + - runner.sh + args: + - ./hack/jenkins/test-dockerized.sh + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + cpu: 4 - name: pull-kubernetes-integration always_run: true decorate: true branches: - - master + - release-1.17 # per-release job path_alias: k8s.io/kubernetes labels: preset-service-account: "true" preset-dind-enabled: "true" spec: containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20191106-09649c7-master + - image: gcr.io/k8s-testimages/kubekins-e2e:v20191106-09649c7-1.17 command: - runner.sh args: @@ -57,6 +82,12 @@ presubmits: periodics: - interval: 1h name: ci-kubernetes-integration-master + decorate: true + extra_refs: + - org: kubernetes + repo: kubernetes + base_ref: master + path_alias: k8s.io/kubernetes labels: preset-service-account: "true" preset-dind-enabled: "true" @@ -70,15 +101,11 @@ periodics: description: "Ends up running: make test-cmd test-integration" spec: containers: - - image: gcr.io/k8s-testimages/bootstrap:v20191021-5489305 + - image: gcr.io/k8s-testimages/kubekins-e2e:v20191106-09649c7-master + command: + - runner.sh args: - - --repo=k8s.io/kubernetes - - --timeout=100 - - --scenario=kubernetes_verify - - -- - - --branch=master - - --force - - --prow + - ./hack/jenkins/test-dockerized.sh # docker-in-docker needs privileged mode securityContext: privileged: true