Re-Add file check to cacheing algorithm

Regardless, I've added a test as part of this PR to catch this issue going forward. Fixes: containers#1906 Signed-off-by: TomSweeneyRedHat <[email protected]>
nalind · Oct 30, 2019 · bb90f81 · bb90f81
1 parent 3a90cf5
commit bb90f81
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/tests/bud.bats b/tests/bud.bats
@@ -1818,3 +1818,29 @@ load helpers
   run_buildah bud --signature-policy ${TESTSDIR}/policy.json --layers -t ${target} git://github.com/containers/BuildSourceImage#master
   run_buildah bud --signature-policy ${TESTSDIR}/policy.json --layers -t ${target} git://github.com/containers/BuildSourceImage
 }
+
+@test "bud containerfile with tar archive in copy" {
+  # First check to verify cache is uses if the tar file does not change
+  target=copy-archive
+  date>bud/${target}/test; tar cJf - bud/${target}/test > bud/${target}/test.tar.xz
+  run_buildah bud --signature-policy ${TESTSDIR}/policy.json --layers -t ${target} ${TESTSDIR}/bud/${target}
+  expect_output --substring "COMMIT copy-archive"
+
+  run_buildah bud --signature-policy ${TESTSDIR}/policy.json --layers -t ${target} ${TESTSDIR}/bud/${target}
+  expect_output --substring " Using cache"
+  expect_output --substring "COMMIT copy-archive"
+
+  # Now test that we do NOT use cache if the tar file changes
+  date>bud/${target}/test; tar cJf - bud/${target}/test > bud/${target}/test.tar.xz
+  run_buildah bud --signature-policy ${TESTSDIR}/policy.json --layers -t ${target} ${TESTSDIR}/bud/${target}
+  expect_output --substring "COMMIT copy-archive"
+
+  date>bud/${target}/test; tar cJf - bud/${target}/test > bud/${target}/test.tar.xz
+  run_buildah bud --signature-policy ${TESTSDIR}/policy.json --layers -t ${target} ${TESTSDIR}/bud/${target}
+  if [[ "$output" =~ " Using cache" ]]; then
+      is "$output" "[no instance of 'Using cache']" "no cache used"
+  fi
+  expect_output --substring "COMMIT copy-archive"
+
+  rm bud/${target}/test*
+}
diff --git a/tests/bud/copy-archive/Containerfile b/tests/bud/copy-archive/Containerfile
@@ -0,0 +1,2 @@
+FROM docker.io/busybox
+ADD test.tar.xz /