summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-14 13:14:11 -0400
committerGitHub <noreply@github.com>2021-09-14 13:14:11 -0400
commit6a34045c670b3f0184b4ba88faeb11bb4a58c747 (patch)
tree856e9ffd0eba7b03c7ee02987f7f61b966eb8ca1 /test
parent65b1ff25a3444f16c9b0524f8a02cd6e56976e2b (diff)
parenta55e2a00fcb82485333eeec55aa2eaee338782d7 (diff)
downloadpodman-6a34045c670b3f0184b4ba88faeb11bb4a58c747.tar.gz
podman-6a34045c670b3f0184b4ba88faeb11bb4a58c747.tar.bz2
podman-6a34045c670b3f0184b4ba88faeb11bb4a58c747.zip
Merge pull request #11170 from flouthoc/support-rootfs-overlay
rootfs: Add support for rootfs-overlay.
Diffstat (limited to 'test')
-rw-r--r--test/buildah-bud/buildah-tests.diff18
1 files changed, 9 insertions, 9 deletions
diff --git a/test/buildah-bud/buildah-tests.diff b/test/buildah-bud/buildah-tests.diff
index 66d470648..bb28e11c9 100644
--- a/test/buildah-bud/buildah-tests.diff
+++ b/test/buildah-bud/buildah-tests.diff
@@ -1,4 +1,4 @@
-From d684753d6f00ee95720d8fb2e09c7ac19b37b01e Mon Sep 17 00:00:00 2001
+From 5baab334cac9853c1d4bae9466d46dbbe5ff7158 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Tue, 9 Feb 2021 17:28:05 -0700
Subject: [PATCH] tweaks for running buildah tests under podman
@@ -9,10 +9,10 @@ Signed-off-by: Ed Santiago <santiago@redhat.com>
1 file changed, 67 insertions(+), 4 deletions(-)
diff --git a/tests/helpers.bash b/tests/helpers.bash
-index 11deb367..44c71dad 100644
+index 166316d5..775d7c9b 100644
--- a/tests/helpers.bash
+++ b/tests/helpers.bash
-@@ -34,6 +34,23 @@ function setup() {
+@@ -43,6 +43,23 @@ EOF
ROOTDIR_OPTS="--root ${TESTDIR}/root --runroot ${TESTDIR}/runroot --storage-driver ${STORAGE_DRIVER}"
BUILDAH_REGISTRY_OPTS="--registries-conf ${TESTSDIR}/registries.conf --registries-conf-dir ${TESTDIR}/registries.d --short-name-alias-conf ${TESTDIR}/cache/shortnames.conf"
PODMAN_REGISTRY_OPTS="--registries-conf ${TESTSDIR}/registries.conf"
@@ -36,8 +36,8 @@ index 11deb367..44c71dad 100644
}
function starthttpd() {
-@@ -57,6 +74,12 @@ function stophttpd() {
- function teardown() {
+@@ -84,6 +101,12 @@ function teardown(){
+ function teardown_tests() {
stophttpd
+ if [[ -n "$PODMAN_SERVER_PID" ]]; then
@@ -49,7 +49,7 @@ index 11deb367..44c71dad 100644
# Workaround for #1991 - buildah + overlayfs leaks mount points.
# Many tests leave behind /var/tmp/.../root/overlay and sub-mounts;
# let's find those and clean them up, otherwise 'rm -rf' fails.
-@@ -129,7 +152,13 @@ function copy() {
+@@ -156,7 +179,13 @@ function copy() {
}
function podman() {
@@ -64,7 +64,7 @@ index 11deb367..44c71dad 100644
}
#################
-@@ -164,15 +193,40 @@ function run_buildah() {
+@@ -191,15 +220,40 @@ function run_buildah() {
--retry) retry=3; shift;; # retry network flakes
esac
@@ -108,7 +108,7 @@ index 11deb367..44c71dad 100644
# without "quotes", multiple lines are glommed together into one
if [ -n "$output" ]; then
echo "$output"
-@@ -396,3 +450,12 @@ function skip_if_no_docker() {
+@@ -477,3 +531,12 @@ function skip_if_no_docker() {
skip "this test needs actual docker, not podman-docker"
fi
}
@@ -122,5 +122,5 @@ index 11deb367..44c71dad 100644
+ fi
+}
--
-2.31.1
+2.25.1