diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-06-16 07:24:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-16 07:24:49 +0000 |
| commit | 78c149ff9129934b5948d01d1178a5427b5b0753 (patch) | |
| tree | 3becd30f59df89828740895331dd61bec12e64e6 /test/system/070-build.bats | |
| parent | a6226540e256895a0e3b6486a36fed0674a25169 (diff) | |
| parent | 0a202a9f03e3bb9c9a2f45f6e2593e60b24f794e (diff) | |
| download | podman-78c149ff9129934b5948d01d1178a5427b5b0753.tar.gz podman-78c149ff9129934b5948d01d1178a5427b5b0753.tar.bz2 podman-78c149ff9129934b5948d01d1178a5427b5b0753.zip | |
Merge pull request #14529 from edsantiago/testimage_with_consistent_timestamps
system test image: bump to 20220615
Diffstat (limited to 'test/system/070-build.bats')
| -rw-r--r-- | test/system/070-build.bats | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/system/070-build.bats b/test/system/070-build.bats index b7e0ab447..ac41dd84d 100644 --- a/test/system/070-build.bats +++ b/test/system/070-build.bats @@ -496,7 +496,12 @@ Labels.$label_name | $label_value "image tree: third line" is "${lines[3]}" "Image Layers" \ "image tree: fourth line" - is "${lines[4]}" ".* ID: [0-9a-f]\{12\} Size: .* Top Layer of: \[$IMAGE]" \ + # FIXME: if #14536 is ever fixed, rebuild testimage & s/5/4/ below. + # Summary: this should be ${lines[4]}, not [5], and prior to 2022-06-15 + # it was. Unfortunately, a nightmarish bug interaction makes it impossible + # for us to use --squash-all on our testimage. Unless/until that bug is + # fixed, we have an extra layer that all we can do is ignore. + is "${lines[5]}" ".* ID: [0-9a-f]\{12\} Size: .* Top Layer of: \[$IMAGE]" \ "image tree: first layer line" is "${lines[-1]}" ".* ID: [0-9a-f]\{12\} Size: .* Top Layer of: \[localhost/build_test:latest]" \ "image tree: last layer line" |