pull-kubernetes-integration: split into Go and cmd testing, for real #34394
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It's annoying that pull-kubernetes-integration also runs "make test-cmd" because it makes the job run longer (which is a problem because it is one of the slowest, thus delaying merging of PRs) and because of the additional, confusing output produced by the shell scripts which tests commands. A trial run with canary jobs was successful. However, the test scripts then got renamed with an additional "test-" prefix. This has been taken account when modifying the actual jobs.
k8s-ci-robot
added
the
do-not-merge/hold
|
cmd.yaml is a copy of integration.yaml with these differences: *** config/jobs/kubernetes/sig-testing/integration.yaml 2025-02-22 13:27:18.918209019 +0100
--- config/jobs/kubernetes/sig-testing/cmd.yaml 2025-02-22 13:22:33.208869958 +0100
***************
*** 1,7 ****
presubmits:
kubernetes/kubernetes:
# this replaces the bootstrap / scenario based job going forward
! - name: pull-kubernetes-integration
cluster: eks-prow-build-cluster
always_run: true
decorate: true
--- 1,7 ----
presubmits:
kubernetes/kubernetes:
# this replaces the bootstrap / scenario based job going forward
! - name: pull-kubernetes-cmd
cluster: eks-prow-build-cluster
always_run: true
decorate: true
***************
*** 25,33 ****
- name: KUBE_INTEGRATION_TEST_MAX_CONCURRENCY
value: "8"
- name: KUBE_TIMEOUT
! value: "-timeout=1h30m"
args:
! - ./hack/jenkins/test-integration-dockerized.sh
# docker-in-docker needs privileged mode
securityContext:
privileged: true
--- 25,33 ----
- name: KUBE_INTEGRATION_TEST_MAX_CONCURRENCY
value: "8"
- name: KUBE_TIMEOUT
! value: "-timeout=30m"
args:
! - ./hack/jenkins/test-cmd-dockerized.sh
# docker-in-docker needs privileged mode
securityContext:
privileged: true
***************
*** 38,44 ****
requests:
cpu: 8
memory: 20Gi
! - name: pull-kubernetes-integration-canary
cluster: eks-prow-build-cluster
always_run: false # Only for canary!
decorate: true
--- 38,44 ----
requests:
cpu: 8
memory: 20Gi
! - name: pull-kubernetes-cmd-canary
cluster: eks-prow-build-cluster
always_run: false # Only for canary!
decorate: true
***************
*** 63,71 ****
- name: KUBE_INTEGRATION_TEST_MAX_CONCURRENCY
value: "8"
- name: KUBE_TIMEOUT
! value: "-timeout=1h30m"
args:
! - ./hack/jenkins/test-integration-dockerized.sh
# docker-in-docker needs privileged mode
securityContext:
privileged: true
--- 63,71 ----
- name: KUBE_INTEGRATION_TEST_MAX_CONCURRENCY
value: "8"
- name: KUBE_TIMEOUT
! value: "-timeout=30m"
args:
! - ./hack/jenkins/test-cmd-dockerized.sh
# docker-in-docker needs privileged mode
securityContext:
privileged: true
***************
*** 76,82 ****
requests:
cpu: 8
memory: 20Gi
! - name: pull-kubernetes-integration-go-compatibility
cluster: k8s-infra-prow-build
always_run: true
decorate: true
--- 76,82 ----
requests:
cpu: 8
memory: 20Gi
! - name: pull-kubernetes-cmd-go-compatibility
cluster: k8s-infra-prow-build
always_run: true
decorate: true
***************
*** 102,108 ****
- name: KUBE_HACK_TOOLS_GOTOOLCHAIN
value: auto
args:
! - ./hack/jenkins/test-integration-dockerized.sh
# docker-in-docker needs privileged mode
securityContext:
privileged: true
--- 102,108 ----
- name: KUBE_HACK_TOOLS_GOTOOLCHAIN
value: auto
args:
! - ./hack/jenkins/test-cmd-dockerized.sh
# docker-in-docker needs privileged mode
securityContext:
privileged: true
***************
*** 113,119 ****
requests:
cpu: 6
memory: 15Gi
! - name: pull-kubernetes-integration-go-canary
cluster: k8s-infra-prow-build
always_run: false
skip_report: false
--- 113,119 ----
requests:
cpu: 6
memory: 15Gi
! - name: pull-kubernetes-cmd-go-canary
cluster: k8s-infra-prow-build
always_run: false
skip_report: false
***************
*** 133,139 ****
command:
- runner.sh
args:
! - ./hack/jenkins/test-integration-dockerized.sh
# docker-in-docker needs privileged mode
securityContext:
privileged: true
--- 133,139 ----
command:
- runner.sh
args:
! - ./hack/jenkins/test-cmd-dockerized.sh
# docker-in-docker needs privileged mode
securityContext:
privileged: true
***************
*** 147,153 ****
periodics:
- interval: 1h
cluster: eks-prow-build-cluster
! name: ci-kubernetes-integration-master
decorate: true
extra_refs:
- org: kubernetes
--- 147,153 ----
periodics:
- interval: 1h
cluster: eks-prow-build-cluster
! name: ci-kubernetes-cmd-master
decorate: true
extra_refs:
- org: kubernetes
***************
*** 161,176 ****
fork-per-release: "true"
fork-per-release-periodic-interval: 2h 2h 6h 24h
testgrid-dashboards: sig-release-master-blocking
! testgrid-tab-name: integration-master
testgrid-alert-email: [email protected]
! description: "Ends up running: make test-integration"
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250212-16f67660c2-master
command:
- runner.sh
args:
! - ./hack/jenkins/test-integration-dockerized.sh
env:
- name: SHORT
value: --short=false
--- 161,176 ----
fork-per-release: "true"
fork-per-release-periodic-interval: 2h 2h 6h 24h
testgrid-dashboards: sig-release-master-blocking
! testgrid-tab-name: cmd-master
testgrid-alert-email: [email protected]
! description: "Ends up running: make test-cmd"
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250212-16f67660c2-master
command:
- runner.sh
args:
! - ./hack/jenkins/test-cmd-dockerized.sh
env:
- name: SHORT
value: --short=false |
k8s-ci-robot
added
cncf-cla: yes
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: pohly The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@pohly: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It's annoying that pull-kubernetes-integration also runs "make test-cmd" because it makes the job run longer (which is a problem because it is one of the slowest, thus delaying merging of PRs) and because of the additional, confusing output produced by the shell scripts which test commands.
A trial run with canary jobs was successful. However, the test scripts then got renamed with an additional "test-" prefix. This has been taken account when modifying the actual jobs.
/hold
Let's merge during normal work hours (Monday?) when @aojea and I are around in case that something breaks.
We can also wait for @BenTheElder.