test: replace import with imports, add one explicit legacy import test

This just changes all the existing tests to test 'imports' rather than 'import'. Then it adds one test for 'import' explicitly and within the same stacker file. Test test/cache.bats test "can read previous version's cache" is skipped as the old version can't build a stacker file in the test because it uses 'imports'. Signed-off-by: Scott Moser <smoser@brickies.net>
project-stacker · Nov 14, 2023 · 17784f3 · 17784f3
1 parent bd8f5a1
commit 17784f3
Show file tree

Hide file tree

Showing 16 changed files with 98 additions and 70 deletions.
diff --git a/test/basic.bats b/test/basic.bats
@@ -14,7 +14,7 @@ centos:
     from:
         type: oci
         url: $CENTOS_OCI
-    import: import
+    imports: import
 EOF
     echo 1 > import
     stacker build
@@ -32,7 +32,7 @@ centos:
     from:
         type: tar
         url: .stacker/layer-bases/centos.tar
-    import:
+    imports:
         - ./stacker.yaml
         - https://www.cisco.com/favicon.ico
         - ./executable
@@ -198,7 +198,7 @@ centos:
     from:
         type: tar
         url: .stacker/layer-bases/centos.tar
-    import:
+    imports:
         - ./stacker.yaml
         - https://www.cisco.com/favicon.ico
         - ./executable

diff --git a/test/broken-link.bats b/test/broken-link.bats
@@ -15,7 +15,7 @@ broken_link:
     from:
         type: oci
         url: $CENTOS_OCI
-    import:
+    imports:
         - dir
     run: cp -a /stacker/imports/dir/testln /testln
 EOF

diff --git a/test/build-only.bats b/test/build-only.bats
@@ -83,15 +83,15 @@ centos:
     from:
         type: oci
         url: $CENTOS_OCI
-    import: https://www.cisco.com/favicon.ico
+    imports: https://www.cisco.com/favicon.ico
     run: |
         cp /stacker/imports/favicon.ico /favicon.ico
     build_only: true
 layer1:
     from:
         type: built
         tag: centos
-    import:
+    imports:
         - stacker://centos/favicon.ico
     run:
         - cp /stacker/imports/favicon.ico /favicon2.ico
@@ -108,15 +108,15 @@ centos:
     from:
         type: oci
         url: $CENTOS_OCI
-    import: https://www.cisco.com/favicon.ico
+    imports: https://www.cisco.com/favicon.ico
     run: |
         cp /stacker/imports/favicon.ico /favicon.ico
     build_only: true
 layer1:
     from:
         type: built
         tag: centos
-    import:
+    imports:
         - stacker://centos/favicon.ico
     run:
         - cp /stacker/imports/favicon.ico /favicon2.ico

diff --git a/test/caching.bats b/test/caching.bats
@@ -52,7 +52,7 @@ base:
     from:
         type: built
         tag: build-base
-    import:
+    imports:
         - foo
     run: |
         cp /stacker/imports/foo /foo
@@ -71,7 +71,7 @@ import-cache:
     from:
         type: oci
         url: $CENTOS_OCI
-    import:
+    imports:
         - link/foo
     run: cp /stacker/imports/foo/zomg /zomg
 EOF
@@ -95,7 +95,7 @@ a:
     from:
         type: oci
         url: $CENTOS_OCI
-    import:
+    imports:
         - foo
     run: |
         [ -f /stacker/imports/foo/bar ]
@@ -111,7 +111,7 @@ a:
     from:
         type: oci
         url: $CENTOS_OCI
-    import:
+    imports:
         - foo
     run: |
         [ ! -f /stacker/imports/foo/bar ]
@@ -126,7 +126,7 @@ bind-test:
     from:
         type: oci
         url: ${{CENTOS_OCI}}
-    import:
+    imports:
         - tree1/foo/zomg
     binds:
         - ${{bind_path}} -> /root/tree2/foo
@@ -169,7 +169,7 @@ mode-test:
     from:
         type: oci
         url: $CENTOS_OCI
-    import:
+    imports:
         - executable
     run: cp /stacker/imports/executable /executable
 EOF
@@ -185,6 +185,7 @@ EOF
 }
 
 @test "can read previous version's cache" {
+    skip "old version does not support imports (plural) directive"
     # some additional testing that the cache can be read by older versions of
     # stacker (cache_test.go has the full test for the type, this just checks
     # the mechanics of filepaths and such)
@@ -204,7 +205,7 @@ test:
     from:
         type: oci
         url: $CENTOS_OCI
-    import:
+    imports:
         - foo
     run: cp /stacker/imports/foo /foo
 EOF

diff --git a/test/cp-not-required.bats b/test/cp-not-required.bats
@@ -27,7 +27,7 @@ contents2:
     from:
         type: built
         tag: build
-    import:
+    imports:
         - stacker://contents/first
         - stacker://contents/second
     run: |

diff --git a/test/dependency-order.bats b/test/dependency-order.bats
@@ -27,7 +27,7 @@ test:
     from:
         type: oci
         tag: $CENTOS_OCI
-    import:
+    imports:
         - stacker://foo/bar
         - stacker://baz/foo
 EOF
@@ -74,7 +74,7 @@ installer-iso-build:
         type: built
         tag: minbase1
     build_only: true
-    import:
+    imports:
         - stacker://installer-initrd/output/installer-initrd-base.cpio
         - stacker://installer-initrd-modules/output/installer-initrd-modules.cpio
     run: |

diff --git a/test/docker-base.bats b/test/docker-base.bats
@@ -14,7 +14,7 @@ centos:
     from:
         type: docker
         url: oci:${CENTOS_OCI}
-    import:
+    imports:
         - https://www.cisco.com/favicon.ico
     run: |
         cp /stacker/imports/favicon.ico /favicon.ico

diff --git a/test/import-http.bats b/test/import-http.bats
@@ -23,7 +23,7 @@ img:
     from:
         type: oci
         url: $(pwd)/oci:centos_base
-    import:
+    imports:
         - http://network-test.debian.org/nm
     run: |
         cp /stacker/imports/nm /root/nm
@@ -79,7 +79,7 @@ centos_base:
     from:
         type: oci
         url: $CENTOS_OCI
-    import:
+    imports:
         - path: https://www.cisco.com/favicon.ico
           dest: /dest/icon
     run: |