Skip to content

Commit 2f09c6c

Browse files
authored
Merge pull request #35769 from danwinship/noendpoints-cpk-skips
More updates to noendpoints job, use cloud-provider-kind
2 parents 730dbaa + 75ca7f4 commit 2f09c6c

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

config/jobs/kubernetes/sig-network/sig-network-kind.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -988,19 +988,29 @@ periodics:
988988
repo: test-infra
989989
base_ref: master
990990
path_alias: "k8s.io/test-infra"
991+
- org: kubernetes-sigs
992+
repo: cloud-provider-kind
993+
base_ref: main
994+
path_alias: sigs.k8s.io/cloud-provider-kind
991995
spec:
992996
containers:
993997
- image: gcr.io/k8s-staging-test-infra/krte:v20250925-95b5a2c7a5-master
994998
command:
995999
- wrapper.sh
9961000
- bash
9971001
- -c
1002+
# compile cloud-provider-kind with kubernetes changes on the PR
1003+
- set -o errexit;
1004+
set -o nounset;
1005+
set -o pipefail;
1006+
set -o xtrace;
1007+
cd $GOPATH/src/sigs.k8s.io/cloud-provider-kind;
9981008
- curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz - -C "${PATH%%:*}/" && $GOPATH/src/k8s.io/test-infra/experiment/kind-noendpoints-e2e.sh
9991009
env:
10001010
- name: LABEL_FILTER
1001-
value: "(Conformance || sig-network ) && !EndpointsController && !EndpointSliceMirroring && !Disruptive && !Flaky"
1011+
value: "(Conformance || sig-network ) && !Disruptive && !Flaky"
10021012
- name: SKIP
1003-
value: SCTPConnectivity
1013+
value: Alpha|Beta|LoadBalancer.Service.without.NodePort|IPv6|SCTPConnectivity|EndpointsController|EndpointSliceMirroring
10041014
- name: PARALLEL
10051015
value: "true"
10061016
# we need privileged mode in order to do docker in docker

experiment/kind-noendpoints-e2e.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,10 @@ run_tests() {
273273
# PID, bash will not run traps while waiting on a process, but it will while
274274
# running a builtin like `wait`, saving the PID also allows us to forward the
275275
# interrupt
276+
# use aws provider to enable cloud-provider tests, aws is just a nullprovider
277+
# without any custom logic
276278
./hack/ginkgo-e2e.sh \
277-
'--provider=skeleton' "--num-nodes=${NUM_NODES}" \
279+
'--provider=aws' "--num-nodes=${NUM_NODES}" \
278280
"--ginkgo.focus=${FOCUS}" "--ginkgo.skip=${SKIP}" "--ginkgo.label-filter=${LABEL_FILTER}" \
279281
"--report-dir=${ARTIFACTS}" '--disable-log-dump=true' &
280282
GINKGO_PID=$!
@@ -297,7 +299,17 @@ main() {
297299
# debug kind version
298300
kind version
299301

302+
# build cloud-provider-kind
303+
make
304+
nohup bin/cloud-provider-kind --enable-log-dumping --logs-dir ${ARTIFACTS}/loadbalancers > ${ARTIFACTS}/ccm-kind.log 2>&1 &
305+
300306
# build kubernetes
307+
K8S_PATH=$(find ${GOPATH} -path '*/k8s.io/kubernetes/go.mod' -print -quit)
308+
if [ -z "${K8S_PATH}" ]; then
309+
K8S_PATH=$(find / -path '*/kubernetes/go.mod' -print -quit)
310+
fi
311+
cd $(dirname ${K8S_PATH})
312+
301313
build
302314
# in CI attempt to release some memory after building
303315
if [ -n "${KUBETEST_IN_DOCKER:-}" ]; then

0 commit comments

Comments
 (0)