Skip to content

Commit e8ed1df

Browse files
committed
ci: Fix Podman job
1 parent 38c079b commit e8ed1df

File tree

4 files changed

+10
-13
lines changed

4 files changed

+10
-13
lines changed

.github/workflows/ci.yaml

+4-7
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,6 @@ jobs:
106106
steps:
107107
- run: cat /etc/os-release || true
108108
- run: podman info
109-
# TODO(rm3l): workaround for https://github.com/actions/runner-images/issues/7753
110-
# (caused by https://bugs.launchpad.net/ubuntu/+source/libpod/+bug/2024394).
111-
# Remove this when this issue is fixed and available in the ubuntu runner image
112-
- run: |
113-
sudo apt install podman=3.4.4+ds1-1ubuntu1 --allow-downgrades
114-
podman info
115109
- name: Checkout
116110
uses: actions/checkout@v4
117111
- name: Setup Go
@@ -133,7 +127,10 @@ jobs:
133127
# This is currently hard-coded because GH won't expose secrets or variables to PRs created from forks.
134128
# Hopefully, variables (which are non-sensible by definition) will be passed to workflows triggered by PRs from forks.
135129
# See https://github.com/community/community/discussions/44322
136-
PODMAN_EXEC_NODES: 10
130+
PODMAN_EXEC_NODES: 1
131+
# Namespacing feature removed from Podman v4.5.0: https://github.com/containers/podman/pull/17586
132+
# TODO(rm3l): ideally, we could separate Podman root to isolate tests and run them in parallel
133+
PODMAN_USE_NAMESPACES: 'false'
137134
run: make test-integration-podman
138135
- name: List and stop remaining containers
139136
if: ${{ always() }}

tests/helper/helper_podman.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func getBooleanValueFromEnvVar(envvar string, defaultValue bool) bool {
2525
}
2626

2727
func GenerateAndSetContainersConf(dir string) {
28-
useNamespaces := getBooleanValueFromEnvVar("PODMAN_USE_NAMESPACES", true)
28+
useNamespaces := getBooleanValueFromEnvVar("PODMAN_USE_NAMESPACES", false)
2929
if !useNamespaces {
3030
return
3131
}

tests/integration/cmd_devfile_list_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ var _ = Describe("odo list with devfile", Label(helper.LabelSkipOnOpenShift), fu
228228
})
229229
})
230230

231-
When("dev is running on podman", Label(helper.LabelPodman), func() {
231+
When("dev is running on podman", Serial, Label(helper.LabelPodman), func() {
232232
BeforeEach(func() {
233233
var err error
234234
devSession, err = helper.StartDevMode(helper.DevSessionOpts{

tests/integration/generic_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@ var _ = Describe("odo generic", Label(helper.LabelSkipOnOpenShift), func() {
142142
Expect(odoVersion).To(ContainSubstring(helper.GetPodmanVersion()))
143143
} else {
144144
Expect(odoVersion).Should(MatchRegexp(reKubernetesVersion))
145-
serverURL := oc.GetCurrentServerURL()
146-
Expect(odoVersion).Should(ContainSubstring("Server: " + serverURL))
147145
if !helper.IsKubernetesCluster() {
146+
serverURL := oc.GetCurrentServerURL()
147+
Expect(odoVersion).Should(ContainSubstring("Server: " + serverURL))
148148
ocpMatcher := ContainSubstring("OpenShift: ")
149149
if serverVersion := commonVar.CliRunner.GetVersion(); serverVersion == "" {
150150
// Might indicate a user permission error on certain clusters (observed with a developer account on Prow nightly jobs)
@@ -164,9 +164,9 @@ var _ = Describe("odo generic", Label(helper.LabelSkipOnOpenShift), func() {
164164
helper.JsonPathSatisfiesAll(odoVersion, "podman.client.version", MatchRegexp(reJSONVersion), Equal(helper.GetPodmanVersion()))
165165
} else {
166166
helper.JsonPathSatisfiesAll(odoVersion, "cluster.kubernetes.version", MatchRegexp(reJSONVersion))
167-
serverURL := oc.GetCurrentServerURL()
168-
helper.JsonPathContentIs(odoVersion, "cluster.serverURL", serverURL)
169167
if !helper.IsKubernetesCluster() {
168+
serverURL := oc.GetCurrentServerURL()
169+
helper.JsonPathContentIs(odoVersion, "cluster.serverURL", serverURL)
170170
m := BeEmpty()
171171
if serverVersion := commonVar.CliRunner.GetVersion(); serverVersion != "" {
172172
// A blank serverVersion might indicate a user permission error on certain clusters (observed with a developer account on Prow nightly jobs)

0 commit comments

Comments
 (0)