Skip to content

Commit ec0e996

Browse files
[CI] add docker-docker-linux-x86-64 integration test in prow
1 parent ad86e07 commit ec0e996

File tree

7 files changed

+130
-5
lines changed

7 files changed

+130
-5
lines changed

hack/prow/common.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ echo $PATH
176176
gotestsum --jsonfile "${JSON_OUT}" --junitfile="${JUNIT_OUT}" -f standard-verbose --raw-command -- \
177177
go tool test2json -t \
178178
${E2E_BIN} \
179+
-test.run TestScheduledStopUnix \
179180
-minikube-start-args="--driver=${DRIVER} ${EXTRA_START_ARGS}" \
180181
-test.timeout=${TIMEOUT} -test.v \
181182
${EXTRA_TEST_ARGS} \
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
3+
# Copyright 2025 The Kubernetes Authors All rights reserved.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
set -e
18+
set -x
19+
20+
OS="linux"
21+
ARCH="amd64"
22+
DRIVER="docker"
23+
CONTAINER_RUNTIME="docker"
24+
EXTRA_START_ARGS=""
25+
EXTRA_TEST_ARGS=""
26+
JOB_NAME="Docker_Linux"
27+
28+
git config --global --add safe.directory '*'
29+
COMMIT=$(git rev-parse HEAD)
30+
MINIKUBE_LOCATION=$COMMIT
31+
32+
33+
# when docker is the driver, we run integration tests directly in prow cluster
34+
# by default, prow jobs run in root, so we must switch to a non-root user to run docker driver
35+
36+
37+
source ./hack/prow/common.sh

hack/prow/integration_kvm_docker_linux_x86-64.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CONTAINER_RUNTIME="docker"
2525
EXTRA_START_ARGS=""
2626
EXTRA_TEST_ARGS=""
2727
JOB_NAME="KVM_Linux"
28-
28+
git config --global --add safe.directory '*'
2929
COMMIT=$(git rev-parse HEAD)
3030
MINIKUBE_LOCATION=$COMMIT
3131
echo "running test in $(pwd)"

hack/prow/prow.mk

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
.PHONY: integration-prow-kvm-docker-linux-x86-64
22

3+
4+
integration-prow-docker-docker-linux-x86-64:
5+
# build first
6+
# container-runtime=docker driver=docker on linux/amd64
7+
./hack/prow/minikube_cross_build.sh $(GO_VERSION) linux amd64
8+
./hack/prow/util/integration_prow_wrapper.sh ./hack/prow/integration_docker_docker_linux_x86-64.sh
9+
310
integration-prow-kvm-docker-linux-x86-64:
411
# build first
512
# container-runtime=docker driver=kvm on linux/amd64
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/bash
2+
3+
# Copyright 2025 The Kubernetes Authors All rights reserved.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
set -x
18+
TARGET_SCRIPT=$1
19+
# run the target script with minikube user
20+
./hack/prow/util/run_with_minikube_user.sh "$TARGET_SCRIPT"
21+
result=$?
22+
# collect the logs as root user
23+
echo "test finished with exit code $result"
24+
25+
items=("testout.txt" "test.json" "junit-unit.xml" "test.html" "test_summary.json")
26+
for item in "${items[@]}"; do
27+
echo "Collecting ${item} to ${ARTIFACTS}/${item}"
28+
cp "${item}" "${ARTIFACTS}/${item}"
29+
done
30+
exit $result
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
3+
# Copyright 2025 The Kubernetes Authors All rights reserved.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
set -e
18+
set -x
19+
20+
# when docker is the driver, we run integration tests directly in prow cluster
21+
# by default, prow jobs run in root, so we must switch to a non-root user to run docker driver
22+
NEW_USER="minikube"
23+
TARGET_SCRIPT=$1
24+
25+
if [ "$(whoami)" == "root" ]; then
26+
useradd -m -s /bin/bash "$NEW_USER"
27+
fi
28+
chown -R "$NEW_USER":"$NEW_USER" .
29+
# install sudo if not present
30+
apt-get update && apt-get install -y sudo
31+
# give the new user passwordless sudo
32+
echo "$NEW_USER ALL=(ALL) NOPASSWD:ALL" > "/etc/sudoers.d/$NEW_USER"
33+
chmod 440 "/etc/sudoers.d/$NEW_USER"
34+
# add the new user to the docker group
35+
usermod -aG docker "$NEW_USER"
36+
# exec the target script as the new user
37+
su "$NEW_USER" -c "$TARGET_SCRIPT"

test/integration/scheduled_stop_test.go

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func TestScheduledStopUnix(t *testing.T) {
8484
startMinikube(ctx, t, profile)
8585

8686
// schedule a stop for 5 min from now and make sure PID is created
87-
stopMinikube(ctx, t, profile, []string{"--schedule", "5m"})
87+
stopMinikube(ctx, t, profile, []string{"--schedule", "5m", "-v=5", "--alsologtostderr"})
8888
// make sure timeToStop is present in status
8989
ensureMinikubeScheduledTime(ctx, t, profile, 5*time.Minute)
9090
pid := checkPID(t, profile)
@@ -93,7 +93,7 @@ func TestScheduledStopUnix(t *testing.T) {
9393
}
9494

9595
// schedule a second stop which should cancel the first scheduled stop
96-
stopMinikube(ctx, t, profile, []string{"--schedule", "15s"})
96+
stopMinikube(ctx, t, profile, []string{"--schedule", "15s", "-v=5", "--alsologtostderr"})
9797
if processRunning(t, pid) {
9898
t.Fatalf("process %v running but should have been killed on reschedule of stop", pid)
9999
}
@@ -109,7 +109,7 @@ func TestScheduledStopUnix(t *testing.T) {
109109
ensureTimeToStopNotPresent(ctx, t, profile)
110110

111111
// schedule another stop, make sure minikube status is "Stopped"
112-
stopMinikube(ctx, t, profile, []string{"--schedule", "15s"})
112+
stopMinikube(ctx, t, profile, []string{"--schedule", "15s", "-v=5", "--alsologtostderr"})
113113
time.Sleep(15 * time.Second)
114114
if processRunning(t, pid) {
115115
t.Fatalf("process %v running but should have been killed on reschedule of stop", pid)
@@ -138,6 +138,9 @@ func stopMinikube(ctx context.Context, t *testing.T, profile string, additionalA
138138
if err != nil {
139139
t.Fatalf("stopping minikube: %v\n%s", err, rr.Output())
140140
}
141+
fmt.Println("minikube stop output:")
142+
fmt.Println(rr.Output())
143+
141144
}
142145

143146
func checkPID(t *testing.T, profile string) string {
@@ -167,7 +170,17 @@ func processRunning(t *testing.T, pid string) bool {
167170
}
168171
err = process.Signal(syscall.Signal(0))
169172
t.Log("signal error was: ", err)
170-
return err == nil
173+
if err != nil {
174+
return false
175+
}
176+
// then check if this process has become a zombie process
177+
// which is also not running
178+
data, _ := os.ReadFile(fmt.Sprintf("/proc/%s/status", pid))
179+
if strings.Contains(string(data), "State:\tZ") {
180+
t.Logf("process %s is a zombie", pid)
181+
return false
182+
}
183+
return true
171184
}
172185
func ensureMinikubeStatus(ctx context.Context, t *testing.T, profile, key string, wantStatus string) {
173186
checkStatus := func() error {

0 commit comments

Comments
 (0)