Skip to content

Commit

Permalink
stop specifying master branch in optional kubernetes kind presubmits
Browse files Browse the repository at this point in the history
- use kind from artifact
- use decorated job instead of bootstrap
- use skip_branches instead of branches
  • Loading branch information
BenTheElder committed Mar 17, 2021
1 parent 1acac76 commit 8fb2053
Showing 1 changed file with 11 additions and 15 deletions.
26 changes: 11 additions & 15 deletions config/jobs/kubernetes/sig-testing/conformance-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ presubmits:
kubernetes/kubernetes:
# conformance test using image against kubernetes master branch with `kind`
- name: pull-kubernetes-conformance-image-test
branches:
- master
skip_branches:
- release-\d+\.\d+ # per-release settings
always_run: false
skip_report: false
max_concurrency: 8
Expand Down Expand Up @@ -46,8 +46,9 @@ presubmits:
description: Runs conformance tests using kind and the conformance image

- name: pull-kubernetes-conformance-kind-ipv6-parallel
branches:
- master
decorate: true
skip_branches:
- release-\d+\.\d+ # per-release settings
always_run: false
skip_report: false
max_concurrency: 8
Expand All @@ -59,7 +60,7 @@ presubmits:
preset-kind-volume-mounts: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210312-67f589a-master
- image: gcr.io/k8s-testimages/krte:v20210312-6badf7a-master
env:
# enable IPV6 in bootstrap image
- name: "DOCKER_IN_DOCKER_IPV6_ENABLED"
Expand All @@ -70,16 +71,11 @@ presubmits:
# skip serial tests and run with --ginkgo-parallel
- name: "PARALLEL"
value: "true"
args:
- "--job=$(JOB_NAME)"
- "--root=/go/src"
- "--repo=k8s.io/kubernetes=$(PULL_REFS)"
- "--repo=sigs.k8s.io/kind=master"
- "--service-account=/etc/service-account/service-account.json"
- "--upload=gs://kubernetes-jenkins/pr-logs"
- "--scenario=execute"
- "--"
- "./../../sigs.k8s.io/kind/hack/ci/e2e.sh"
command:
- wrapper.sh
- bash
- -c
- curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz - -C "${PATH%%:*}/" && e2e-k8s.sh
# we need privileged mode in order to do docker in docker
securityContext:
privileged: true
Expand Down

0 comments on commit 8fb2053

Please sign in to comment.