add separate test args

Author: daler

.github/workflows/build-images.yml

@@ -50,6 +50,8 @@ jobs:
           if tag_exists $BASE_BUSYBOX_IMAGE_NAME $BASE_TAG \
           && tag_exists $BASE_DEBIAN_IMAGE_NAME $BASE_TAG \
           && tag_exists $BUILD_ENV_IMAGE_NAME $BIOCONDA_IMAGE_TAG \
+          && tag_exists $BOT_IMAGE_NAME $BIOCONDA_IMAGE_TAG \
+          && tag_exists $ISSUE_RESPONDER_IMAGE_NAME $BIOCONDA_IMAGE_TAG \
           && tag_exists $CREATE_ENV_IMAGE_NAME $BIOCONDA_IMAGE_TAG; then
             echo "DO_BUILD=false" >> $GITHUB_OUTPUT
           else
@@ -104,6 +106,8 @@ jobs:
         time bash build.sh base-glibc-debian-bash
         time bash build.sh build-env
         time bash build.sh create-env
+        time bash build.sh bot
+        time bash build.sh bioconda-recipes-issue-responder
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4

images/base-glibc-busybox-bash/prepare.sh

@@ -21,3 +21,6 @@ rm "${iidfile}"
 BUILD_ARGS=()
 BUILD_ARGS+=("--build-arg=debian_version=${DEBIAN_VERSION}")
 BUILD_ARGS+=("--build-arg=busybox_image=${busybox_image}")
+
+TEST_ARGS=()
+TEST_ARGS+=("--build-arg=base=${IMAGE_NAME}:${TAG}-${CURRENT_ARCH}")

images/base-glibc-debian-bash/prepare.sh

@@ -3,3 +3,6 @@ IMAGE_NAME="${BASE_DEBIAN_IMAGE_NAME}"
 TAG="$BASE_TAG"
 BUILD_ARGS=()
 BUILD_ARGS+=("--build-arg=debian_version=$DEBIAN_VERSION")
+
+TEST_ARGS=()
+TEST_ARGS+=("--build-arg=base=${IMAGE_NAME}:${TAG}-${CURRENT_ARCH}")

images/bioconda-recipes-issue-responder/prepare.sh

@@ -10,3 +10,6 @@ ONLY_AMD64=true
 BUILD_ARGS=()
 BUILD_ARGS+=("--build-arg=create_env=${CREATE_ENV_IMAGE_NAME}:${BIOCONDA_IMAGE_TAG}-${CURRENT_ARCH}")
 BUILD_ARGS+=("--build-arg=base=${BASE_BUSYBOX_IMAGE_NAME}:${BASE_TAG}-${CURRENT_ARCH}")
+
+TEST_ARGS=()
+TEST_ARGS+=("--build-arg=base=${IMAGE_NAME}:${TAG}-${CURRENT_ARCH}")

images/bot/prepare.sh

@@ -9,4 +9,7 @@ ONLY_AMD64=true
 
 BUILD_ARGS=()
 BUILD_ARGS+=("--build-arg=create_env=${CREATE_ENV_IMAGE_NAME}:${BIOCONDA_IMAGE_TAG}-${CURRENT_ARCH}")
-BUILD_ARGS+=("--build-arg=base=localhost/${BASE_BUSYBOX_IMAGE_NAME}:${BASE_TAG}-${CURRENT_ARCH}")
+BUILD_ARGS+=("--build-arg=base=${BASE_BUSYBOX_IMAGE_NAME}:${BASE_TAG}-${CURRENT_ARCH}")
+
+TEST_ARGS=()
+TEST_ARGS+=("--build-arg=base=${IMAGE_NAME}:${TAG}-${CURRENT_ARCH}")

images/build-env/prepare.sh

@@ -23,3 +23,6 @@ BUILD_ARGS=()
 # Where to find the copied-over bioconda-utils
 BUILD_ARGS+=("--build-arg=BIOCONDA_UTILS_FOLDER=bioconda-utils")
 BUILD_ARGS+=("--build-arg=bioconda_utils_version=$BIOCONDA_UTILS_VERSION")
+
+TEST_ARGS=()
+TEST_ARGS+=("--build-arg=base=${IMAGE_NAME}:${TAG}-${CURRENT_ARCH}")

images/build.sh

@@ -95,7 +95,7 @@ for arch in $ARCHS; do
 
   # Run basic test in Dockerfile.test
   buildah bud \
-    --build-arg=base="$" \
+    ${TEST_ARGS[@]} \
     --file=Dockerfile.test \
     --build-arg=base="${image_id}"
 

images/create-env/prepare.sh

@@ -15,9 +15,8 @@ CONDA_VERSION=$(
 export CONDA_VERSION=${CONDA_VERSION%$'\r'}
 
 BUILD_ARGS+=("--build-arg=CONDA_VERSION=$CONDA_VERSION")
+BUILD_ARGS+=("--build-arg=BUSYBOX_IMAGE=${BASE_BUSYBOX_IMAGE_NAME}:${BASE_TAG}-${CURRENT_ARCH}")
 
-# Arguments to buildah bud are architecture-dependent
-BUILD_ARGS+=("--build-arg=BUSYBOX_IMAGE=localhost/${BASE_BUSYBOX_IMAGE_NAME}:${BASE_TAG}-${CURRENT_ARCH}")
-
-# TEST_BUILD_ARGS=()
-# TEST_BUILD_ARGS+=("--build-arg=BUSYBOX_IMAGE=$BUSYBOX_IMAGE")
+TEST_ARGS=()
+TEST_ARGS+=("--build-arg=base=${IMAGE_NAME}:${TAG}-${CURRENT_ARCH}")
+TEST_ARGS+=("--build-arg=BUSYBOX_IMAGE=${BASE_BUSYBOX_IMAGE_NAME}:${BASE_TAG}-${CURRENT_ARCH}")