From 6feb2662ef36896a9156ac9ad6d901123a876c51 Mon Sep 17 00:00:00 2001 From: schristoff <28318173+schristoff@users.noreply.github.com> Date: Wed, 2 Aug 2023 20:33:35 -0600 Subject: [PATCH] bug: fix jq url in image (#2853) bug: fix jq url in image --------- Signed-off-by: Sarah Christoff <28318173+schristoff@users.noreply.github.com> Signed-off-by: Allan Guwatudde --- tests/integration/build_test.go | 2 +- .../testdata/bundles/exec-outputs/Dockerfile.tmpl | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/integration/build_test.go b/tests/integration/build_test.go index aa74f771d8..0ea828bad8 100644 --- a/tests/integration/build_test.go +++ b/tests/integration/build_test.go @@ -124,7 +124,7 @@ func TestRebuild(t *testing.T) { // Explain the bundle a bunch more times, it should not rebuild again. // This is a regression test for a bug where the manifest would be considered out-of-date when nothing had changed // caused by us using a go map when comparing the mixins used in the bundle, which has inconsistent sort order... - for i := 0; i < 10; i++ { + for i := 0; i < 5; i++ { _, output = test.RequirePorter("explain") tests.RequireOutputContains(t, output, "Bundle is up-to-date!", "expected the previous build to be reused") } diff --git a/tests/integration/testdata/bundles/exec-outputs/Dockerfile.tmpl b/tests/integration/testdata/bundles/exec-outputs/Dockerfile.tmpl index ed838face7..223ef35ab0 100644 --- a/tests/integration/testdata/bundles/exec-outputs/Dockerfile.tmpl +++ b/tests/integration/testdata/bundles/exec-outputs/Dockerfile.tmpl @@ -7,9 +7,10 @@ ARG BUNDLE_DIR RUN apt-get update && apt-get install -y wget && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install gnupg2 -y ENV JQ_VERSION='1.6' -RUN wget --no-check-certificate https://raw.githubusercontent.com/stedolan/jq/master/sig/jq-release.key -O /tmp/jq-release.key && \ - wget --no-check-certificate https://raw.githubusercontent.com/stedolan/jq/master/sig/v${JQ_VERSION}/jq-linux64.asc -O /tmp/jq-linux64.asc && \ - wget --no-check-certificate https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 -O /tmp/jq-linux64 && \ + +RUN wget --no-check-certificate https://raw.githubusercontent.com/jqlang/jq/master/sig/jq-release-old.key -O /tmp/jq-release.key && \ + wget --no-check-certificate https://raw.githubusercontent.com/jqlang/jq/master/sig/v${JQ_VERSION}/jq-linux64.asc -O /tmp/jq-linux64.asc && \ + wget --no-check-certificate https://github.com/jqlang/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 -O /tmp/jq-linux64 && \ gpg --import /tmp/jq-release.key && \ gpg --verify /tmp/jq-linux64.asc /tmp/jq-linux64 && \ cp /tmp/jq-linux64 /usr/bin/jq && \ @@ -19,4 +20,4 @@ RUN wget --no-check-certificate https://raw.githubusercontent.com/stedolan/jq/ma rm -f /tmp/jq-linux64 # Use the BUNDLE_DIR build argument to copy files into the bundle -COPY . ${BUNDLE_DIR} +COPY . ${BUNDLE_DIR} \ No newline at end of file