Skip to content

Commit

Permalink
Merge pull request #22421 from Luap99/compose-test
Browse files Browse the repository at this point in the history
CI: remove compose v1 tests
  • Loading branch information
openshift-merge-bot[bot] authored Apr 18, 2024
2 parents 01d0f88 + b1736c4 commit 6eaa1d5
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 38 deletions.
9 changes: 1 addition & 8 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -619,19 +619,12 @@ compose_test_task:
gce_instance: *standardvm
matrix:
- env:
TEST_FLAVOR: compose
PRIV_NAME: root
- env:
TEST_FLAVOR: compose
PRIV_NAME: rootless
- env:
TEST_FLAVOR: compose_v2
PRIV_NAME: root
- env:
TEST_FLAVOR: compose_v2
PRIV_NAME: rootless
env:
<<: *stdenvars
TEST_FLAVOR: compose_v2
clone_script: *get_gosrc
setup_script: *setup
main_script: *main
Expand Down
6 changes: 0 additions & 6 deletions contrib/cirrus/runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ function _run_apiv2() {
) |& logformatter
}

function _run_compose() {
_bail_if_test_can_be_skipped test/compose

showrun ./test/compose/test-compose |& logformatter
}

function _run_compose_v2() {
_bail_if_test_can_be_skipped test/compose

Expand Down
5 changes: 0 additions & 5 deletions contrib/cirrus/setup_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -367,11 +367,6 @@ case "$TEST_FLAVOR" in
showrun pip install --upgrade pip
showrun pip install --requirement $GOSRC/test/apiv2/python/requirements.txt
;& # continue with next item
compose)
showrun make install.tools
showrun dnf remove -y gvisor-tap-vsock
showrun dnf install -y podman-docker*
;& # continue with next item
int)
showrun make .install.ginkgo
;&
Expand Down
7 changes: 4 additions & 3 deletions test/compose/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
Tests for docker-compose
========================
Tests for docker-compose v2
===========================

This directory contains tests for docker-compose under podman.
This directory contains tests for docker-compose v2 under podman.
docker-compose v1 is no longer supported upstream so we no longer test with it.

Each subdirectory must contain one docker-compose.yml file along with
all necessary infrastructure for it (e.g. Containerfile, any files
Expand Down
5 changes: 1 addition & 4 deletions test/compose/etc_hosts/tests.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# -*- bash -*-

ctr_name="etc_hosts_test_1"
if [ "$TEST_FLAVOR" = "compose_v2" ]; then
ctr_name="etc_hosts-test-1"
fi
ctr_name="etc_hosts-test-1"

podman exec "$ctr_name" sh -c 'grep "foobar" /etc/hosts'
like "$output" "10\.123\.0\." "$testname : no entries are copied from the host"
Expand Down
5 changes: 1 addition & 4 deletions test/compose/ipam_set_ip/tests.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# -*- bash -*-

ctr_name="ipam_set_ip_test_1"
if [ "$TEST_FLAVOR" = "compose_v2" ]; then
ctr_name="ipam_set_ip-test-1"
fi
ctr_name="ipam_set_ip-test-1"
podman container inspect "$ctr_name" --format '{{ .NetworkSettings.Networks.ipam_set_ip_net1.IPAddress }}'
is "$output" "10.123.0.253" "$testname : ip address is set"
podman container inspect "$ctr_name" --format '{{ .NetworkSettings.Networks.ipam_set_ip_net1.MacAddress }}'
Expand Down
5 changes: 1 addition & 4 deletions test/compose/two_networks/tests.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# -*- bash -*-

ctr_name="two_networks_con1_1"
if [ "$TEST_FLAVOR" = "compose_v2" ]; then
ctr_name="two_networks-con1-1"
fi
ctr_name="two_networks-con1-1"
podman container inspect "$ctr_name" --format '{{len .NetworkSettings.Networks}}'
is "$output" "2" "$testname : Container is connected to both networks"
podman container inspect "$ctr_name" --format '{{.NetworkSettings.Networks}}'
Expand Down
5 changes: 1 addition & 4 deletions test/compose/uptwice/tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,5 @@ output=$(podman_compose up -d 2>&1)
# Horrible output check here but we really want to make sure that there are
# no unexpected warning/errors and the normal messages are send on stderr as
# well so we cannot check for an empty stderr.
expected="Recreating uptwice_app_1 ... ${CR}${NL}Recreating uptwice_app_1 ... done$CR"
if [ "$TEST_FLAVOR" = "compose_v2" ]; then
expected="Container uptwice-app-1 Recreate${NL}Container uptwice-app-1 Recreated${NL}Container uptwice-app-1 Starting${NL}Container uptwice-app-1 Started"
fi
expected="Container uptwice-app-1 Recreate${NL}Container uptwice-app-1 Recreated${NL}Container uptwice-app-1 Starting${NL}Container uptwice-app-1 Started"
is "$output" "$expected" "no error output in compose up (#15580)"

1 comment on commit 6eaa1d5

@packit-as-a-service
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

podman-next COPR build failed. @containers/packit-build please check.

Please sign in to comment.