Skip to content

Commit

Permalink
CI VMs: bump, to debian with cgroups v2
Browse files Browse the repository at this point in the history
Per consent in 2024-03-20 Planning, remove support for cgroups v1.
And, per discovery on 2024-05-28, systemd 256 no longer even
boots on a cgroups v1 system.

This commit switches to VMs built in:

  containers/automation_images#338

...in which Debian is now cgroups v2 with crun.

Requires disabling two conformance tests which fail when run
against docker 26.1; see containers#5526 for context on those.

And, latest git on f40 refuses to serve non-root files when
run as root ("dubious ownership"); so, in start_git_daemon(),
chown the extracted files.

Signed-off-by: Ed Santiago <santiago@redhat.com>
  • Loading branch information
edsantiago committed May 29, 2024
1 parent 0d7eb12 commit 2f2aa74
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ env:
DEBIAN_NAME: "debian-13"

# Image identifiers
IMAGE_SUFFIX: "c20240411t124913z-f39f38d13"
IMAGE_SUFFIX: "c20240528t194313z-f40f39d13"
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
DEBIAN_CACHE_IMAGE_NAME: "debian-${IMAGE_SUFFIX}"
Expand Down
48 changes: 25 additions & 23 deletions tests/conformance/conformance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1496,11 +1496,12 @@ var internalTestCases = []testCase{
fsSkip: []string{"(dir):usr:(dir):bin:mtime"},
},

{
name: "copy with --chown",
contextDir: "copychown",
fsSkip: []string{"(dir):usr:(dir):bin:mtime", "(dir):usr:(dir):local:(dir):bin:mtime"},
},
// FIXME 2024-05-29 fails under vfs, see #5526
// {
// name: "copy with --chown",
// contextDir: "copychown",
// fsSkip: []string{"(dir):usr:(dir):bin:mtime", "(dir):usr:(dir):local:(dir):bin:mtime"},
// },

{
name: "directory with slash",
Expand Down Expand Up @@ -1583,24 +1584,25 @@ var internalTestCases = []testCase{
},
},

{
// from internal team chat
name: "ci-pipeline-modified",
dockerfileContents: strings.Join([]string{
"FROM busybox",
"WORKDIR /go/src/github.com/openshift/ocp-release-operator-sdk/",
"ENV GOPATH=/go",
"RUN env | grep -E -v '^(HOSTNAME|OLDPWD)=' | LANG=C sort | tee /env-contents.txt\n",
}, "\n"),
fsSkip: []string{
"(dir):go:mtime",
"(dir):go:(dir):src:mtime",
"(dir):go:(dir):src:(dir):github.com:mtime",
"(dir):go:(dir):src:(dir):github.com:(dir):openshift:mtime",
"(dir):go:(dir):src:(dir):github.com:(dir):openshift:(dir):ocp-release-operator-sdk:mtime",
"(dir):env-contents.txt:mtime",
},
},
// FIXME 2024-05-29 fails with latest buildah, see #5526
// {
// // from internal team chat
// name: "ci-pipeline-modified",
// dockerfileContents: strings.Join([]string{
// "FROM busybox",
// "WORKDIR /go/src/github.com/openshift/ocp-release-operator-sdk/",
// "ENV GOPATH=/go",
// "RUN env | grep -E -v '^(HOSTNAME|OLDPWD)=' | LANG=C sort | tee /env-contents.txt\n",
// }, "\n"),
// fsSkip: []string{
// "(dir):go:mtime",
// "(dir):go:(dir):src:mtime",
// "(dir):go:(dir):src:(dir):github.com:mtime",
// "(dir):go:(dir):src:(dir):github.com:(dir):openshift:mtime",
// "(dir):go:(dir):src:(dir):github.com:(dir):openshift:(dir):ocp-release-operator-sdk:mtime",
// "(dir):env-contents.txt:mtime",
// },
// },

{
name: "add-permissions",
Expand Down
6 changes: 6 additions & 0 deletions tests/helpers.bash
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,12 @@ function start_git_daemon() {
daemondir=${TEST_SCRATCH_DIR}/git-daemon
mkdir -p ${daemondir}/repo
gzip -dc < ${1:-${TEST_SOURCES}/git-daemon/repo.tar.gz} | tar x -C ${daemondir}/repo

# git >=2.45 aborts with "dubious ownership" error if serving other user's files as root
if ! is_rootless; then
chown -R root:root ${daemondir}/repo
fi

GITPORT=$(($RANDOM + 32768))
git daemon --detach --pid-file=${TEST_SCRATCH_DIR}/git-daemon/pid --reuseaddr --port=${GITPORT} --base-path=${daemondir} ${daemondir}
}
Expand Down

0 comments on commit 2f2aa74

Please sign in to comment.