Skip to content

Commit 92e5f3b

Browse files
lsm5lsm5
committed
TMT: add more tests
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
1 parent 872ab48 commit 92e5f3b

File tree

13 files changed

+187
-69
lines changed

13 files changed

+187
-69
lines changed

‎.packit.yaml‎

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ files_to_sync:
2121
dest: plans/
2222
delete: true
2323
mkpath: true
24-
- src: systemtest/tmt/
24+
- src: tmt/
2525
dest: test/tmt/
2626
delete: true
2727
mkpath: true
@@ -96,19 +96,59 @@ jobs:
9696
project: podman-next
9797
enable_net: true
9898

99-
# Tests on Fedora for main branch
99+
# System tests on Fedora
100100
- job: tests
101101
trigger: pull_request
102102
packages: [skopeo-fedora]
103103
notifications: &test_failure_notification
104104
failure_comment:
105105
message: "Tests failed. @containers/packit-build please check."
106106
targets: *fedora_copr_targets
107-
tf_extra_params:
107+
tf_extra_params: &extra_repos
108108
environments:
109109
- artifacts:
110110
- type: repository-file
111111
id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
112+
tmt_plan: "/plans/rpm/system"
113+
identifier: "system"
114+
115+
# Integration tests on Fedora
116+
- job: tests
117+
trigger: pull_request
118+
packages: [skopeo-fedora]
119+
notifications: *test_failure_notification
120+
targets: *fedora_copr_targets
121+
tf_extra_params: *extra_repos
122+
tmt_plan: "/plans/rpm/integration"
123+
identifier: "integration"
124+
125+
# Unit tests on Fedora
126+
- job: tests
127+
trigger: pull_request
128+
skip_build: true
129+
notifications: *test_failure_notification
130+
targets: &fedora_no_rpm_targets
131+
- fedora-latest-stable
132+
tmt_plan: "/plans/no-rpm/unit"
133+
identifier: "unit"
134+
135+
# Validate test on Fedora
136+
- job: tests
137+
trigger: pull_request
138+
skip_build: true
139+
notifications: *test_failure_notification
140+
targets: *fedora_no_rpm_targets
141+
tmt_plan: "/plans/no-rpm/validate"
142+
identifier: "validate"
143+
144+
# Test w/ opengpg static linked on Fedora
145+
- job: tests
146+
trigger: pull_request
147+
skip_build: true
148+
notifications: *test_failure_notification
149+
targets: *fedora_no_rpm_targets
150+
tmt_plan: "/plans/no-rpm/opengpg"
151+
identifier: "opengpg"
112152

113153
# Tests on CentOS Stream for main branch
114154
# Ignore until golang is updated in distro buildroot to go 1.23.3+

‎Makefile‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,7 @@ test-integration:
203203

204204

205205
# Intended for CI, assumed to be running in quay.io/libpod/skopeo_cidev container.
206-
test-integration-local: bin/skopeo
207-
hack/warn-destructive-tests.sh
206+
test-integration-local: $(if $(SKOPEO_BINARY),,bin/skopeo)
208207
hack/test-integration.sh
209208

210209
# complicated set of options needed to run podman-in-podman
@@ -220,8 +219,7 @@ test-system:
220219
exit $$rc
221220

222221
# Intended for CI, assumed to already be running in quay.io/libpod/skopeo_cidev container.
223-
test-system-local: bin/skopeo
224-
hack/warn-destructive-tests.sh
222+
test-system-local: $(if $(SKOPEO_BINARY),,bin/skopeo)
225223
hack/test-system.sh
226224

227225
test-unit:
@@ -235,7 +233,7 @@ validate:
235233
test-all-local: validate-local validate-docs test-unit-local
236234

237235
.PHONY: validate-local
238-
validate-local:
236+
validate-local: tools
239237
hack/validate-git-marks.sh
240238
hack/validate-gofmt.sh
241239
$(GOBIN)/golangci-lint run --build-tags "${BUILDTAGS}"

‎hack/test-integration.sh‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
#!/bin/bash
22
set -e
33

4-
make PREFIX=/usr install
4+
if [[ -v SKOPEO_BINARY ]]; then
5+
echo "Testing with $SKOPEO_BINARY ..."
6+
else
7+
echo "Testing with $(git rev-parse --show-toplevel)/bin/skopeo ..."
8+
fi
59

6-
echo "cd ./integration;" go test $TESTFLAGS ${BUILDTAGS:+-tags "$BUILDTAGS"}
10+
echo "cd ./integration;" go test "$TESTFLAGS" ${BUILDTAGS:+-tags "$BUILDTAGS"}
711
cd ./integration
8-
go test $TESTFLAGS ${BUILDTAGS:+-tags "$BUILDTAGS"}
12+
go test "$TESTFLAGS" ${BUILDTAGS:+-tags "$BUILDTAGS"}

‎hack/test-system.sh‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,12 @@ EOF
3737
export CONTAINERS_STORAGE_CONF=/etc/containers/storage.conf
3838
fi
3939

40-
# Build skopeo, install into /usr/bin
41-
make PREFIX=/usr install
40+
if [[ -v SKOPEO_BINARY ]]; then
41+
echo "Testing with $SKOPEO_BINARY ..."
42+
else
43+
echo "Testing with $(git rev-parse --show-toplevel)/bin/skopeo ..."
44+
fi
4245

4346
# Run tests
44-
SKOPEO_BINARY=/usr/bin/skopeo bats --tap systemtest
47+
# The skopeo binary used will be at ../bin/skopeo unless set via SKOPEO_BINARY
48+
bats --tap systemtest

‎hack/tmt/bats-setup.sh‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/env bash
2+
3+
set -exo pipefail
4+
5+
# Install bats
6+
# https://bats-core.readthedocs.io/en/stable/installation.html
7+
8+
BATS_TMPDIR=$(mktemp -d)
9+
pushd "$BATS_TMPDIR"
10+
11+
BATS_VERSION=1.12.0
12+
curl -ssfL https://github.com/bats-core/bats-core/archive/refs/tags/v"$BATS_VERSION".tar.gz | tar -xz
13+
pushd bats-core-"$BATS_VERSION"
14+
./install.sh /usr
15+
popd
16+
popd

‎hack/tmt/dnf-repo-setup.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
3+
set -exo pipefail
4+
5+
COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo"
6+
if compgen -G "$COPR_REPO_FILE" > /dev/null; then
7+
# shellcheck disable=SC2016
8+
sed -i -n '/^priority=/!p;$apriority=1' "$COPR_REPO_FILE"
9+
fi
10+
dnf -y upgrade --allowerasing

‎integration/registry_test.go‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,17 @@ import (
1313
)
1414

1515
const (
16-
binaryV2 = "registry-v2"
1716
binaryV2Schema1 = "registry-v2-schema1"
1817
)
1918

19+
// getBinaryV2 returns the available registry binary name, preferring "registry-v2" over "registry"
20+
func getBinaryV2() string {
21+
if _, err := exec.LookPath("registry-v2"); err == nil {
22+
return "registry-v2"
23+
}
24+
return "registry"
25+
}
26+
2027
type testRegistryV2 struct {
2128
cmd *exec.Cmd
2229
url string
@@ -92,7 +99,7 @@ compatibility:
9299
if schema1 {
93100
cmd = exec.Command(binaryV2Schema1, confPath)
94101
} else {
95-
cmd = exec.Command(binaryV2, "serve", confPath)
102+
cmd = exec.Command(getBinaryV2(), "serve", confPath)
96103
}
97104

98105
consumeAndLogOutputs(t, fmt.Sprintf("registry-%s", url), cmd)

‎plans/main.fmf‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎plans/no-rpm.fmf‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
discover:
2+
how: fmf
3+
execute:
4+
how: tmt
5+
6+
/validate:
7+
discover+:
8+
test: /tmt/validate
9+
10+
/unit:
11+
discover+:
12+
test: /tmt/unit
13+
14+
/opengpg:
15+
prepare+:
16+
- when: distro == centos-stream or distro == rhel
17+
how: shell
18+
script: bash hack/tmt/bats-setup.sh
19+
order: 10
20+
discover+:
21+
test: /tmt/opengpg

‎plans/rpm.fmf‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
discover:
2+
how: fmf
3+
execute:
4+
how: tmt
5+
prepare:
6+
- when: initiator == packit
7+
how: shell
8+
script: bash hack/tmt/dnf-repo-setup.sh
9+
order: 5
10+
11+
/system:
12+
prepare+:
13+
- when: distro == centos-stream or distro == rhel
14+
how: shell
15+
script: bash hack/tmt/bats-setup.sh
16+
order: 10
17+
discover+:
18+
test: /tmt/system
19+
20+
/integration:
21+
discover+:
22+
test: /tmt/integration

0 commit comments

Comments
 (0)