From 7cd70fdc46c0a9745e44ec03dadd68fa1e994f62 Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Thu, 29 Sep 2022 18:12:13 -0400 Subject: [PATCH] [PATCH] Merge pull request jenkinsci/docker-inbound-agent#286 from dduportal/fix/gh-285-review chore(test) fix build argument tests by using an old version --- tests/tests.bats | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/tests.bats b/tests/tests.bats index 13b81580b..9a73a470a 100755 --- a/tests/tests.bats +++ b/tests/tests.bats @@ -45,11 +45,14 @@ SUT_IMAGE=$(get_sut_image) @test "[${SUT_IMAGE}] use build args correctly" { cd "${BATS_TEST_DIRNAME}"/.. || false - local ARG_TEST_VERSION - local TEST_VERSION="3063.v26e24490f041" + # Old version used to test overriding the build arguments. + # This old version must have the same tag suffixes as the ones defined in the docker-bake file (`-jdk17`, `jdk11`, etc.) + local TEST_VERSION="3046.v38db_38a_b_7a_86" local DOCKER_AGENT_VERSION_SUFFIX="1" - local TEST_USER="root" + local ARG_TEST_VERSION="${TEST_VERSION}-${DOCKER_AGENT_VERSION_SUFFIX}" + local TEST_USER="root" + local FOLDER=$(get_dockerfile_directory)