Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch 1.16 test-integration to podutils, bump to go1.13.4 #15637

Merged
merged 1 commit into from
Dec 18, 2019
Merged

Switch 1.16 test-integration to podutils, bump to go1.13.4 #15637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions config/jobs/kubernetes/sig-release/release-branch-jobs/1.16.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,23 +289,25 @@ periodics:
preset-dind-enabled: "true"
preset-service-account: "true"
name: ci-kubernetes-integration-stable1
decorate: true
extra_refs:
- org: kubernetes
repo: kubernetes
base_ref: release-1.16
path_alias: k8s.io/kubernetes
spec:
containers:
- args:
- --repo=k8s.io/kubernetes=release-1.16
- --timeout=100
- --scenario=kubernetes_verify
- --
- --branch=release-1.16
- --force
- --prow
image: gcr.io/k8s-testimages/bootstrap:v20191203-6fb6647
name: ""
resources:
requests:
cpu: "4"
- image: gcr.io/k8s-testimages/kubekins-e2e:v20191213-55437e3-1.16
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: 6h 24h
Expand Down
25 changes: 23 additions & 2 deletions config/jobs/kubernetes/sig-testing/integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ presubmits:
- name: pull-kubernetes-integration
always_run: true
branches:
# we migrated to podutils for v1.17+
- release-1.16
# we migrated to podutils for v1.16+
- release-1.15
- release-1.14
labels:
Expand Down Expand Up @@ -79,6 +78,28 @@ presubmits:
resources:
requests:
cpu: 4
- name: pull-kubernetes-integration
always_run: true
decorate: true
branches:
- release-1.16 # 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:v20191213-55437e3-1.16
command:
- runner.sh
args:
- ./hack/jenkins/test-dockerized.sh
# docker-in-docker needs privileged mode
securityContext:
privileged: true
resources:
requests:
cpu: 4
periodics:
- interval: 1h
name: ci-kubernetes-integration-master
Expand Down
2 changes: 1 addition & 1 deletion images/builder/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ and `cloudbuild.yaml`. For example, a subset of the `kubekins-e2e` variants look
variants:
'1.16':
CONFIG: '1.16'
GO_VERSION: 1.12.12
GO_VERSION: 1.13.4
K8S_RELEASE: stable-1.16
BAZEL_VERSION: 0.23.2
'1.15':
Expand Down
2 changes: 1 addition & 1 deletion images/kubekins-e2e/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ variants:
BAZEL_VERSION: 0.23.2
'1.16':
CONFIG: '1.16'
GO_VERSION: 1.12.12
GO_VERSION: 1.13.4
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, I think we need a rebuild/bump of kubekins images to pick this up

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cblecker @BenTheElder is there an automated process to bump these or do I need to open a PR?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like #15627 will do that

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The bump process is still somewhat manual, but will be merged later today.

K8S_RELEASE: stable-1.16
BAZEL_VERSION: 0.23.2
'1.15':
Expand Down