Skip to content

Commit 5326fc4

Browse files
authored
ci: fix broken nightly (again) (#659)
Signed-off-by: Ramkumar Chinchani <[email protected]>
1 parent 50d5bdc commit 5326fc4

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

test/convert.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ EOF
7979
@test "python" {
8080
skip_slow_test
8181
git clone https://github.com/docker-library/python.git
82-
cd python/3.11/alpine3.19
82+
cd python/3.11/alpine3.21
8383
chmod -R a+rw .
8484
stacker convert --docker-file Dockerfile --output-file stacker.yaml --substitute-file stacker-subs.yaml
8585
stacker build -f stacker.yaml --substitute-file stacker-subs.yaml --substitute IMAGE=python

test/helpers.bash

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,17 @@ if [ "$(id -u)" != "0" ]; then
88
exit 1
99
fi
1010

11+
function give_user_ownership() {
12+
if [ "$PRIVILEGE_LEVEL" = "priv" ]; then
13+
return
14+
fi
15+
if [ -z "$SUDO_UID" ]; then
16+
echo "PRIVILEGE_LEVEL=$PRIVILEGE_LEVEL but empty SUDO_USER"
17+
exit 1
18+
fi
19+
chown -R "$SUDO_USER:$SUDO_USER" "$@"
20+
}
21+
1122
function skip_if_no_unpriv_overlay {
1223
local wdir=""
1324
# use a workdir to ensure no side effects to the caller
@@ -80,17 +91,6 @@ function stacker_setup() {
8091
chown -R $SUDO_USER:$SUDO_USER .
8192
}
8293

83-
function give_user_ownership() {
84-
if [ "$PRIVILEGE_LEVEL" = "priv" ]; then
85-
return
86-
fi
87-
if [ -z "$SUDO_UID" ]; then
88-
echo "PRIVILEGE_LEVEL=$PRIVILEGE_LEVEL but empty SUDO_USER"
89-
exit 1
90-
fi
91-
chown -R "$SUDO_USER:$SUDO_USER" "$@"
92-
}
93-
9494
function cleanup() {
9595
cd "$ROOT_DIR/test"
9696
umount_under "$TEST_TMPDIR"

0 commit comments

Comments
 (0)