From ff5f537182120d933df2e6b1ebcad20d381a0729 Mon Sep 17 00:00:00 2001 From: Martin Malina Date: Tue, 17 Dec 2024 13:50:21 +0100 Subject: [PATCH] fix(RELEASE-1345): bump image in push-rpm-data-to-pyxis (#744) The new image contains a fix to avoid failing on invalid purl strings. See this related PR: https://github.com/konflux-ci/release-service-utils/pull/343 Signed-off-by: Martin Malina --- tasks/push-rpm-data-to-pyxis/README.md | 4 ++++ tasks/push-rpm-data-to-pyxis/push-rpm-data-to-pyxis.yaml | 6 +++--- .../tests/test-push-rpm-data-to-pyxis-cyclonedx.yaml | 4 ++-- .../tests/test-push-rpm-data-to-pyxis-failure.yaml | 2 +- .../tests/test-push-rpm-data-to-pyxis-multi-arch.yaml | 4 ++-- .../tests/test-push-rpm-data-to-pyxis-parallel.yaml | 4 ++-- .../tests/test-push-rpm-data-to-pyxis-single-arch.yaml | 6 +++--- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/tasks/push-rpm-data-to-pyxis/README.md b/tasks/push-rpm-data-to-pyxis/README.md index 2ddcb5dae..50b6f601d 100644 --- a/tasks/push-rpm-data-to-pyxis/README.md +++ b/tasks/push-rpm-data-to-pyxis/README.md @@ -13,6 +13,10 @@ all repository_id strings found in rpm purl strings in the sboms. | server | The server type to use. Options are 'production','production-internal,'stage-internal' and 'stage'. | Yes | production | | concurrentLimit | The maximum number of images to be processed at once | Yes | 4 | +## Changes in 1.3.2 +* Updated the base image used in this task + * The new image avoids failing on invalid purl strings + ## Changes in 1.3.1 * Avoid "dir already exists" error in case the task is retried in a pipelinerun diff --git a/tasks/push-rpm-data-to-pyxis/push-rpm-data-to-pyxis.yaml b/tasks/push-rpm-data-to-pyxis/push-rpm-data-to-pyxis.yaml index 42009e4f3..d73ab3573 100644 --- a/tasks/push-rpm-data-to-pyxis/push-rpm-data-to-pyxis.yaml +++ b/tasks/push-rpm-data-to-pyxis/push-rpm-data-to-pyxis.yaml @@ -4,7 +4,7 @@ kind: Task metadata: name: push-rpm-data-to-pyxis labels: - app.kubernetes.io/version: "1.3.1" + app.kubernetes.io/version: "1.3.2" annotations: tekton.dev/pipelines.minVersion: "0.12.1" tekton.dev/tags: release @@ -40,7 +40,7 @@ spec: steps: - name: download-sbom-files image: - quay.io/konflux-ci/release-service-utils:f7adbd837f43941f161b6da830b2091267889e34 + quay.io/konflux-ci/release-service-utils:34016ab5a3904257c198a12d1829b0093214b6ee script: | #!/usr/bin/env bash set -eux @@ -99,7 +99,7 @@ spec: - name: push-rpm-data-to-pyxis image: - quay.io/konflux-ci/release-service-utils:f7adbd837f43941f161b6da830b2091267889e34 + quay.io/konflux-ci/release-service-utils:34016ab5a3904257c198a12d1829b0093214b6ee env: - name: pyxisCert valueFrom: diff --git a/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-cyclonedx.yaml b/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-cyclonedx.yaml index 808a947ae..85201aca2 100644 --- a/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-cyclonedx.yaml +++ b/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-cyclonedx.yaml @@ -20,7 +20,7 @@ spec: - name: data steps: - name: setup-values - image: quay.io/konflux-ci/release-service-utils:f7adbd837f43941f161b6da830b2091267889e34 + image: quay.io/konflux-ci/release-service-utils:34016ab5a3904257c198a12d1829b0093214b6ee script: | #!/usr/bin/env sh set -eux @@ -79,7 +79,7 @@ spec: - name: data steps: - name: check-result - image: quay.io/konflux-ci/release-service-utils:f7adbd837f43941f161b6da830b2091267889e34 + image: quay.io/konflux-ci/release-service-utils:34016ab5a3904257c198a12d1829b0093214b6ee script: | #!/usr/bin/env sh set -eux diff --git a/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-failure.yaml b/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-failure.yaml index 8835ae830..b3162633f 100644 --- a/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-failure.yaml +++ b/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-failure.yaml @@ -21,7 +21,7 @@ spec: - name: data steps: - name: setup-values - image: quay.io/konflux-ci/release-service-utils:f7adbd837f43941f161b6da830b2091267889e34 + image: quay.io/konflux-ci/release-service-utils:34016ab5a3904257c198a12d1829b0093214b6ee script: | #!/usr/bin/env sh set -eux diff --git a/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-multi-arch.yaml b/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-multi-arch.yaml index 72e188d18..f8b84aa8d 100644 --- a/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-multi-arch.yaml +++ b/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-multi-arch.yaml @@ -19,7 +19,7 @@ spec: - name: data steps: - name: setup-values - image: quay.io/konflux-ci/release-service-utils:f7adbd837f43941f161b6da830b2091267889e34 + image: quay.io/konflux-ci/release-service-utils:34016ab5a3904257c198a12d1829b0093214b6ee script: | #!/usr/bin/env sh set -eux @@ -92,7 +92,7 @@ spec: - name: data steps: - name: check-result - image: quay.io/konflux-ci/release-service-utils:f7adbd837f43941f161b6da830b2091267889e34 + image: quay.io/konflux-ci/release-service-utils:34016ab5a3904257c198a12d1829b0093214b6ee script: | #!/usr/bin/env sh set -eux diff --git a/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-parallel.yaml b/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-parallel.yaml index 229ac0374..f4de3b8fd 100644 --- a/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-parallel.yaml +++ b/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-parallel.yaml @@ -19,7 +19,7 @@ spec: - name: data steps: - name: setup-values - image: quay.io/konflux-ci/release-service-utils:f7adbd837f43941f161b6da830b2091267889e34 + image: quay.io/konflux-ci/release-service-utils:34016ab5a3904257c198a12d1829b0093214b6ee script: | #!/usr/bin/env sh set -eux @@ -116,7 +116,7 @@ spec: - name: data steps: - name: check-result - image: quay.io/konflux-ci/release-service-utils:f7adbd837f43941f161b6da830b2091267889e34 + image: quay.io/konflux-ci/release-service-utils:34016ab5a3904257c198a12d1829b0093214b6ee script: | #!/usr/bin/env sh set -eux diff --git a/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-single-arch.yaml b/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-single-arch.yaml index 3bae0f151..de6395a6c 100644 --- a/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-single-arch.yaml +++ b/tasks/push-rpm-data-to-pyxis/tests/test-push-rpm-data-to-pyxis-single-arch.yaml @@ -19,7 +19,7 @@ spec: - name: data steps: - name: setup-values - image: quay.io/konflux-ci/release-service-utils:f7adbd837f43941f161b6da830b2091267889e34 + image: quay.io/konflux-ci/release-service-utils:34016ab5a3904257c198a12d1829b0093214b6ee script: | #!/usr/bin/env sh set -eux @@ -83,7 +83,7 @@ spec: - name: sbomPath steps: - name: check-result - image: quay.io/konflux-ci/release-service-utils:f7adbd837f43941f161b6da830b2091267889e34 + image: quay.io/konflux-ci/release-service-utils:34016ab5a3904257c198a12d1829b0093214b6ee script: | #!/usr/bin/env sh set -eux @@ -105,7 +105,7 @@ spec: cat "$(workspaces.data.path)/mock_select-oci-auth.txt" exit 1 fi - + test "$(params.sbomPath)" == "./downloaded-sboms" runAfter: - run-task