From 3897848edcf4c22d49a7ddd5f40f6210e428913a Mon Sep 17 00:00:00 2001 From: Ramkumar Chinchani <45800463+rchincha@users.noreply.github.com> Date: Sun, 26 Nov 2023 17:51:08 -0800 Subject: [PATCH] revert: "test: add a bom workflow with substitutions (#562)" (#563) This reverts commit da119e7b457dec83e08890f60650f1fbea59453c. Signed-off-by: Ramkumar Chinchani --- test/bom.bats | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/bom.bats b/test/bom.bats index 3d7b8e67..772e9814 100644 --- a/test/bom.bats +++ b/test/bom.bats @@ -114,7 +114,7 @@ bom-child: type: built tag: bom-parent bom: - generate: ${{GENERATE}} + generate: true packages: - name: pkg3 version: 1.0.0 @@ -129,7 +129,7 @@ bom-child: org.opencontainers.image.vendor: bom-test org.opencontainers.image.licenses: MIT EOF - stacker build --substitute GENERATE=true + stacker build [ -f .stacker/artifacts/bom-parent/installed-packages.json ] # a full inventory for this image [ -f .stacker/artifacts/bom-parent/inventory.json ] @@ -163,7 +163,7 @@ bom-alpine: type: docker url: docker://ghcr.io/project-stacker/alpine:edge bom: - generate: ${{GENERATE}} + generate: true packages: - name: pkg1 version: 1.0.0 @@ -175,7 +175,7 @@ bom-alpine: org.opencontainers.image.licenses: MIT run: | # discover installed pkgs - [ ${{GENERATE}} = true ] && /stacker/tools/static-stacker bom discover + /stacker/tools/static-stacker bom discover # run our cmds ls -al / # some changes @@ -183,7 +183,7 @@ bom-alpine: # cleanup rm -f /etc/alpine-release /etc/apk/arch /etc/apk/repositories /etc/apk/world /etc/issue /etc/os-release /etc/secfixes.d/alpine /lib/apk/db/installed /lib/apk/db/lock /lib/apk/db/scripts.tar /lib/apk/db/triggers EOF - stacker build --substitute GENERATE=true + stacker build [ -f .stacker/artifacts/bom-alpine/installed-packages.json ] # a full inventory for this image [ -f .stacker/artifacts/bom-alpine/inventory.json ]