From 0154f9e9b3d158dce901c9f19261714660a2f27b Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Tue, 8 Dec 2020 16:26:51 -0500
Subject: Honor the --layers flag

Currently the --layers flag set by the user is ignored, and only the BUILDAH_LAYERS
environment variable being set is observed.

Fixes: https://github.com/containers/podman/issues/8643

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 test/system/070-build.bats | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

(limited to 'test/system')

diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 59da503a6..8e9a2d613 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -381,6 +381,48 @@ a${random3}z"
     run_podman rmi -f build_test
 }
 
+@test "podman build --layers test" {
+    rand_content=$(random_string 50)
+    tmpdir=$PODMAN_TMPDIR/build-test
+    run mkdir -p $tmpdir
+    containerfile=$tmpdir/Containerfile
+    cat >$containerfile <<EOF
+FROM $IMAGE
+RUN echo $rand_content
+EOF
+
+    # Build twice to make sure second time uses cache
+    run_podman build -t build_test $tmpdir
+    if [[ "$output" =~ "Using cache" ]]; then
+        is "$output" "[no instance of 'Using cache']" "no cache used"
+    fi
+
+    run_podman build -t build_test $tmpdir
+    is "$output" ".*cache" "used cache"
+
+    run_podman build -t build_test --layers=true $tmpdir
+    is "$output" ".*cache" "used cache"
+
+    run_podman build -t build_test --layers=false $tmpdir
+    if [[ "$output" =~ "Using cache" ]]; then
+        is "$output" "[no instance of 'Using cache']" "no cache used"
+    fi
+
+    BUILDAH_LAYERS=false run_podman build -t build_test $tmpdir
+    if [[ "$output" =~ "Using cache" ]]; then
+        is "$output" "[no instance of 'Using cache']" "no cache used"
+    fi
+
+    BUILDAH_LAYERS=false run_podman build -t build_test --layers=1 $tmpdir
+    is "$output" ".*cache" "used cache"
+
+    BUILDAH_LAYERS=1 run_podman build -t build_test --layers=false $tmpdir
+    if [[ "$output" =~ "Using cache" ]]; then
+        is "$output" "[no instance of 'Using cache']" "no cache used"
+    fi
+
+    run_podman rmi -a --force
+}
 
 function teardown() {
     # A timeout or other error in 'build' can leave behind stale images
-- 
cgit v1.2.3-54-g00ecf