Support extra build arg in build_and_push

RedHatInsights · Oct 30, 2023 · 15cc62f · 15cc62f
1 parent f59b01f
commit 15cc62f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/shared/image_builder.sh b/src/shared/image_builder.sh
@@ -30,7 +30,7 @@ cicd::image_builder::local_build() {
 }
 
 cicd::image_builder::build_and_push() {
-  cicd::image_builder::build || return 1
+  cicd::image_builder::build "$@" || return 1
   if ! cicd::image_builder::local_build; then
     cicd::image_builder::push || return 1
   fi

diff --git a/test/shared_image_builder.bats b/test/shared_image_builder.bats
@@ -695,7 +695,7 @@ setup() {
     assert_output --regexp "^build.*-t foobar:pr-123-extra2"
 }
 
-@test "Support extra build args" {
+@test "Support extra build args for build" {
 
     # podman mock
     podman() {
@@ -706,8 +706,25 @@ setup() {
 
     export CICD_IMAGE_BUILDER_IMAGE_NAME='foobar'
     export CICD_IMAGE_BUILDER_CONTAINERFILE_PATH='test/data/Containerfile.test'
-    
+
     run cicd::image_builder::build --some-extra-arg1 foo=foo:bar --another-extra-arg foobar=bazbar
 
     assert_output --regexp "^build.*--some-extra-arg1 foo=foo:bar --another-extra-arg foobar=bazbar"
 }
+
+@test "Support extra build args for build_and_push" {
+
+    # podman mock
+    podman() {
+        echo "$@"
+    }
+
+    source load_module.sh image_builder
+
+    export CICD_IMAGE_BUILDER_IMAGE_NAME='foobar'
+    export CICD_IMAGE_BUILDER_CONTAINERFILE_PATH='test/data/Containerfile.test'
+
+    run cicd::image_builder::build_and_push --some-extra-arg1 foo=foo:bar --another-extra-arg foobar=bazbar
+
+    assert_output --regexp "^build.*--some-extra-arg1 foo=foo:bar --another-extra-arg foobar=bazbar"
+}