From db73e977bb08d0bc489689448bd2eb586558faa6 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Fri, 17 Jan 2025 10:54:12 +0100 Subject: [PATCH 1/7] [spike] prefetch RPM dependencies --- .tekton/scanner-db-build.yaml | 8 ++--- .tekton/scanner-db-slim-build.yaml | 8 ++--- image/scanner/rhel/konflux.Dockerfile | 4 +-- rpms.in.yaml | 10 ++++++ rpms.lock.yaml | 48 +++++++++++++++++++++++++++ 5 files changed, 66 insertions(+), 12 deletions(-) create mode 100644 rpms.in.yaml create mode 100644 rpms.lock.yaml diff --git a/.tekton/scanner-db-build.yaml b/.tekton/scanner-db-build.yaml index fd2b10bf3..29716803f 100644 --- a/.tekton/scanner-db-build.yaml +++ b/.tekton/scanner-db-build.yaml @@ -44,12 +44,10 @@ spec: value: '{{revision}}' - name: rebuild value: 'true' - # TODO(ROX-20234): Enable hermetic builds - # - name: hermetic - # value: "true" - # No language dependencies are required for scanner-db image. + - name: hermetic + value: "true" - name: prefetch-input - value: '' + value: '{"type": "rpm", "path": "."}' - name: build-source-image value: 'true' - name: build-target-stage diff --git a/.tekton/scanner-db-slim-build.yaml b/.tekton/scanner-db-slim-build.yaml index a02bd0956..d9f82334d 100644 --- a/.tekton/scanner-db-slim-build.yaml +++ b/.tekton/scanner-db-slim-build.yaml @@ -44,12 +44,10 @@ spec: value: '{{revision}}' - name: rebuild value: 'true' - # TODO(ROX-20234): Enable hermetic builds - # - name: hermetic - # value: "true" - # No language dependencies are required for scanner-db-slim image. + - name: hermetic + value: "true" - name: prefetch-input - value: '' + value: '{"type": "rpm", "path": "."}' - name: build-source-image value: 'true' - name: build-target-stage diff --git a/image/scanner/rhel/konflux.Dockerfile b/image/scanner/rhel/konflux.Dockerfile index 731cd1125..b284cd4ca 100644 --- a/image/scanner/rhel/konflux.Dockerfile +++ b/image/scanner/rhel/konflux.Dockerfile @@ -66,8 +66,8 @@ COPY --chown=65534:65534 --from=builder /src/image/scanner/dump/genesis_manifest COPY LICENSE /licenses/LICENSE -RUN microdnf upgrade --nobest && \ - microdnf install xz && \ +# RUN microdnf upgrade --nobest && \ +RUN microdnf install xz && \ microdnf clean all && \ # (Optional) Remove line below to keep package management utilities # We don't uninstall rpm because scanner uses it to get packages installed in scanned images. diff --git a/rpms.in.yaml b/rpms.in.yaml new file mode 100644 index 000000000..0bf8747ee --- /dev/null +++ b/rpms.in.yaml @@ -0,0 +1,10 @@ +packages: [xz] +contentOrigin: + repofiles: ["./ubi.repo"] +context: + image: registry.access.redhat.com/ubi8-minimal:latest +arches: + - aarch64 + - ppc64le + - s390x + - x86_64 diff --git a/rpms.lock.yaml b/rpms.lock.yaml new file mode 100644 index 000000000..55c92bdbb --- /dev/null +++ b/rpms.lock.yaml @@ -0,0 +1,48 @@ +--- +lockfileVersion: 1 +lockfileVendor: redhat +arches: +- arch: aarch64 + packages: + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/x/xz-5.2.4-4.el8_6.aarch64.rpm + repoid: ubi-8-baseos-rpms + size: 156276 + checksum: sha256:342a2504cb34c9a5c1d43906f534cb1f3bf1de58ac517d575cff57053d04ab00 + name: xz + evr: 5.2.4-4.el8_6 + sourcerpm: xz-5.2.4-4.el8_6.src.rpm + source: [] + module_metadata: [] +- arch: ppc64le + packages: + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/x/xz-5.2.4-4.el8_6.ppc64le.rpm + repoid: ubi-8-baseos-rpms + size: 162264 + checksum: sha256:80d2fc754452ae52b3b36504e5cceb5cd5435a97999351402ae7a28298592a01 + name: xz + evr: 5.2.4-4.el8_6 + sourcerpm: xz-5.2.4-4.el8_6.src.rpm + source: [] + module_metadata: [] +- arch: s390x + packages: + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/x/xz-5.2.4-4.el8_6.s390x.rpm + repoid: ubi-8-baseos-rpms + size: 155012 + checksum: sha256:7fb678077d965dd6aeb09df28ce05cba9c22e4110d4b52f1ee43986beb87a5ff + name: xz + evr: 5.2.4-4.el8_6 + sourcerpm: xz-5.2.4-4.el8_6.src.rpm + source: [] + module_metadata: [] +- arch: x86_64 + packages: + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/x/xz-5.2.4-4.el8_6.x86_64.rpm + repoid: ubi-8-baseos-rpms + size: 156884 + checksum: sha256:fa4ceb20dbf23e9408a6446fefc4b709bc85e0bc563ca423569bbe08ecee2c5e + name: xz + evr: 5.2.4-4.el8_6 + sourcerpm: xz-5.2.4-4.el8_6.src.rpm + source: [] + module_metadata: [] From 9ee324d437208da888f639cfba70a5fdb2c586c4 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Fri, 17 Jan 2025 10:59:02 +0100 Subject: [PATCH 2/7] enable dev-package-managers for RPM support --- .tekton/scanner-component-pipeline.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.tekton/scanner-component-pipeline.yaml b/.tekton/scanner-component-pipeline.yaml index eb0322548..db76b514f 100644 --- a/.tekton/scanner-component-pipeline.yaml +++ b/.tekton/scanner-component-pipeline.yaml @@ -230,6 +230,9 @@ spec: value: $(params.output-image-repo):konflux-$(params.revision).prefetch - name: ociArtifactExpiresAfter value: $(params.oci-artifact-expires-after) + # Required for RPM prefetching support + - name: dev-package-managers + value: "true" taskRef: params: - name: name From 850a4d6f73e23bda539e08ee1ac2a926f22047ac Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Fri, 17 Jan 2025 11:12:05 +0100 Subject: [PATCH 3/7] prefetch contents for scanner --- .tekton/scanner-build.yaml | 7 +++---- .tekton/scanner-db-slim-build.yaml | 8 +++++--- .tekton/scanner-slim-build.yaml | 7 +++---- image/scanner/rhel/konflux.Dockerfile | 1 - 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.tekton/scanner-build.yaml b/.tekton/scanner-build.yaml index 2a8113455..f103b31d8 100644 --- a/.tekton/scanner-build.yaml +++ b/.tekton/scanner-build.yaml @@ -44,11 +44,10 @@ spec: value: '{{revision}}' - name: rebuild value: 'true' - # TODO(ROX-20234): Enable hermetic builds - # - name: hermetic - # value: "true" + - name: hermetic + value: "true" - name: prefetch-input - value: '{"type": "gomod", "path": "."}' + value: '[{"type": "gomod", "path": "."}, {"type": "rpm", "path": "."}]' - name: build-source-image value: 'true' - name: build-target-stage diff --git a/.tekton/scanner-db-slim-build.yaml b/.tekton/scanner-db-slim-build.yaml index d9f82334d..a02bd0956 100644 --- a/.tekton/scanner-db-slim-build.yaml +++ b/.tekton/scanner-db-slim-build.yaml @@ -44,10 +44,12 @@ spec: value: '{{revision}}' - name: rebuild value: 'true' - - name: hermetic - value: "true" + # TODO(ROX-20234): Enable hermetic builds + # - name: hermetic + # value: "true" + # No language dependencies are required for scanner-db-slim image. - name: prefetch-input - value: '{"type": "rpm", "path": "."}' + value: '' - name: build-source-image value: 'true' - name: build-target-stage diff --git a/.tekton/scanner-slim-build.yaml b/.tekton/scanner-slim-build.yaml index 18f48e1fd..12e8ffad6 100644 --- a/.tekton/scanner-slim-build.yaml +++ b/.tekton/scanner-slim-build.yaml @@ -44,11 +44,10 @@ spec: value: '{{revision}}' - name: rebuild value: 'true' - # TODO(ROX-20234): Enable hermetic builds - # - name: hermetic - # value: "true" + - name: hermetic + value: "true" - name: prefetch-input - value: '{"type": "gomod", "path": "."}' + value: '[{"type": "gomod", "path": "."}, {"type": "rpm", "path": "."}]' - name: build-source-image value: 'true' - name: build-target-stage diff --git a/image/scanner/rhel/konflux.Dockerfile b/image/scanner/rhel/konflux.Dockerfile index b284cd4ca..bf345d466 100644 --- a/image/scanner/rhel/konflux.Dockerfile +++ b/image/scanner/rhel/konflux.Dockerfile @@ -66,7 +66,6 @@ COPY --chown=65534:65534 --from=builder /src/image/scanner/dump/genesis_manifest COPY LICENSE /licenses/LICENSE -# RUN microdnf upgrade --nobest && \ RUN microdnf install xz && \ microdnf clean all && \ # (Optional) Remove line below to keep package management utilities From ddc694b651be7ba1e2284730aa5ba4e1029bb6bc Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Fri, 17 Jan 2025 12:31:53 +0100 Subject: [PATCH 4/7] script improvements, cleanups --- .../scripts/rpm-prefetching/rpms.in.yaml | 0 .../scripts/rpm-prefetching/rpms.lock.yaml | 0 .konflux/scripts/rpm-prefetching/ubi.repo | 70 +++++++++++++++++++ .konflux/scripts/update-rpm-lockfile.sh | 40 +++++++++++ .tekton/scanner-db-build.yaml | 3 +- .tekton/scanner-db-slim-build.yaml | 5 +- image/db/rhel/konflux.Dockerfile | 3 +- 7 files changed, 115 insertions(+), 6 deletions(-) rename rpms.in.yaml => .konflux/scripts/rpm-prefetching/rpms.in.yaml (100%) rename rpms.lock.yaml => .konflux/scripts/rpm-prefetching/rpms.lock.yaml (100%) create mode 100644 .konflux/scripts/rpm-prefetching/ubi.repo create mode 100755 .konflux/scripts/update-rpm-lockfile.sh diff --git a/rpms.in.yaml b/.konflux/scripts/rpm-prefetching/rpms.in.yaml similarity index 100% rename from rpms.in.yaml rename to .konflux/scripts/rpm-prefetching/rpms.in.yaml diff --git a/rpms.lock.yaml b/.konflux/scripts/rpm-prefetching/rpms.lock.yaml similarity index 100% rename from rpms.lock.yaml rename to .konflux/scripts/rpm-prefetching/rpms.lock.yaml diff --git a/.konflux/scripts/rpm-prefetching/ubi.repo b/.konflux/scripts/rpm-prefetching/ubi.repo new file mode 100644 index 000000000..bdc28e0a6 --- /dev/null +++ b/.konflux/scripts/rpm-prefetching/ubi.repo @@ -0,0 +1,70 @@ +[ubi-8-baseos-rpms] +name = Red Hat Universal Base Image 8 (RPMs) - BaseOS +baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/baseos/os +enabled = 1 +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +gpgcheck = 1 + +[ubi-8-baseos-debug-rpms] +name = Red Hat Universal Base Image 8 (Debug RPMs) - BaseOS +baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/baseos/debug +enabled = 0 +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +gpgcheck = 1 + +[ubi-8-baseos-source] +name = Red Hat Universal Base Image 8 (Source RPMs) - BaseOS +baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/baseos/source/SRPMS +enabled = 0 +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +gpgcheck = 1 + +[ubi-8-appstream-rpms] +name = Red Hat Universal Base Image 8 (RPMs) - AppStream +baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/appstream/os +enabled = 1 +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +gpgcheck = 1 + +[ubi-8-appstream-debug-rpms] +name = Red Hat Universal Base Image 8 (Debug RPMs) - AppStream +baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/appstream/debug +enabled = 0 +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +gpgcheck = 1 + +[ubi-8-appstream-source] +name = Red Hat Universal Base Image 8 (Source RPMs) - AppStream +baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/appstream/source/SRPMS +enabled = 0 +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +gpgcheck = 1 + +[ubi-8-codeready-builder-rpms] +name = Red Hat Universal Base Image 8 (RPMs) - CodeReady Builder +baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/codeready-builder/os +enabled = 1 +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +gpgcheck = 1 + +[ubi-8-codeready-builder] +name = Red Hat Universal Base Image 8 (RPMs) - CodeReady Builder +baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/codeready-builder/os +enabled = 0 +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +gpgcheck = 1 + + +[ubi-8-codeready-builder-debug-rpms] +name = Red Hat Universal Base Image 8 (Debug RPMs) - CodeReady Builder +baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/codeready-builder/debug +enabled = 0 +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +gpgcheck = 1 + +[ubi-8-codeready-builder-source] +name = Red Hat Universal Base Image 8 (Source RPMs) - CodeReady Builder +baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/codeready-builder/source/SRPMS +enabled = 0 +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +gpgcheck = 1 diff --git a/.konflux/scripts/update-rpm-lockfile.sh b/.konflux/scripts/update-rpm-lockfile.sh new file mode 100755 index 000000000..644ccb02e --- /dev/null +++ b/.konflux/scripts/update-rpm-lockfile.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +################################################ +# This script updates the RPM lockfile based on +# the information in rpms.in.yaml. +# If new RPMs are installed in the images, add +# them to rpms.in.yaml and re-run this script. +# +# Usage: .konflux/scripts/update-rpm-lockfile.sh +################################################ + +set -euo pipefail + +RPM_LOCKFILE_VERSION="v0.13.2" +BASE_IMAGE="registry.access.redhat.com/ubi8-minimal:latest" + +LOCAL_DIR="$(dirname "${BASH_SOURCE[0]}")/rpm-prefetching" +RPM_LOCKFILE_RUNNER_IMAGE="localhost/rpm-lockfile-runner:latest" + +fetch_ubi_repo_definitions() { + podman run "${BASE_IMAGE}" cat /etc/yum.repos.d/ubi.repo > "${LOCAL_DIR}/ubi.repo" +} + +build_rpm_lockfile_runner_image() { + curl "https://raw.githubusercontent.com/konflux-ci/rpm-lockfile-prototype/refs/tags/${RPM_LOCKFILE_VERSION}/Containerfile" \ + | podman build -t "${RPM_LOCKFILE_RUNNER_IMAGE}" \ + --build-arg GIT_REF=tags/${RPM_LOCKFILE_VERSION} - +} + +run_rpm_lockfile_runner() { + local container_dir=/work + podman run --rm -v "$(pwd)/${LOCAL_DIR}:${container_dir}" \ + "${RPM_LOCKFILE_RUNNER_IMAGE}" \ + --outfile=${container_dir}/rpms.lock.yaml \ + ${container_dir}/rpms.in.yaml +} + +fetch_ubi_repo_definitions +build_rpm_lockfile_runner_image +run_rpm_lockfile_runner diff --git a/.tekton/scanner-db-build.yaml b/.tekton/scanner-db-build.yaml index 29716803f..9b5f13f98 100644 --- a/.tekton/scanner-db-build.yaml +++ b/.tekton/scanner-db-build.yaml @@ -46,8 +46,9 @@ spec: value: 'true' - name: hermetic value: "true" + # No language dependencies are required for scanner-db image. - name: prefetch-input - value: '{"type": "rpm", "path": "."}' + value: '' - name: build-source-image value: 'true' - name: build-target-stage diff --git a/.tekton/scanner-db-slim-build.yaml b/.tekton/scanner-db-slim-build.yaml index a02bd0956..408f4b1b9 100644 --- a/.tekton/scanner-db-slim-build.yaml +++ b/.tekton/scanner-db-slim-build.yaml @@ -44,9 +44,8 @@ spec: value: '{{revision}}' - name: rebuild value: 'true' - # TODO(ROX-20234): Enable hermetic builds - # - name: hermetic - # value: "true" + - name: hermetic + value: "true" # No language dependencies are required for scanner-db-slim image. - name: prefetch-input value: '' diff --git a/image/db/rhel/konflux.Dockerfile b/image/db/rhel/konflux.Dockerfile index 79049bdfa..df52c70b9 100644 --- a/image/db/rhel/konflux.Dockerfile +++ b/image/db/rhel/konflux.Dockerfile @@ -30,8 +30,7 @@ COPY image/db/rhel/scripts/docker-entrypoint.sh \ COPY LICENSE /licenses/LICENSE -RUN dnf upgrade -y --nobest && \ - localedef -f UTF-8 -i en_US en_US.UTF-8 && \ +RUN localedef -f UTF-8 -i en_US en_US.UTF-8 && \ mkdir -p /var/lib/postgresql && \ groupmod -g 70 postgres && \ usermod -u 70 postgres -d /var/lib/postgresql && \ From 00c78c396b19f227dee2b6cfdb74fb0e0422ac5d Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Fri, 17 Jan 2025 15:58:59 +0100 Subject: [PATCH 5/7] fix path to prefetching --- .tekton/scanner-build.yaml | 2 +- .tekton/scanner-slim-build.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.tekton/scanner-build.yaml b/.tekton/scanner-build.yaml index f103b31d8..33c125b06 100644 --- a/.tekton/scanner-build.yaml +++ b/.tekton/scanner-build.yaml @@ -47,7 +47,7 @@ spec: - name: hermetic value: "true" - name: prefetch-input - value: '[{"type": "gomod", "path": "."}, {"type": "rpm", "path": "."}]' + value: '[{"type": "gomod", "path": "."}, {"type": "rpm", "path": ".konflux/scripts/rpm-prefetching"}]' - name: build-source-image value: 'true' - name: build-target-stage diff --git a/.tekton/scanner-slim-build.yaml b/.tekton/scanner-slim-build.yaml index 12e8ffad6..1c49e620c 100644 --- a/.tekton/scanner-slim-build.yaml +++ b/.tekton/scanner-slim-build.yaml @@ -47,7 +47,7 @@ spec: - name: hermetic value: "true" - name: prefetch-input - value: '[{"type": "gomod", "path": "."}, {"type": "rpm", "path": "."}]' + value: '[{"type": "gomod", "path": "."}, {"type": "rpm", "path": ".konflux/scripts/rpm-prefetching"}]' - name: build-source-image value: 'true' - name: build-target-stage From 75d480c4e6000a9ea3ee6c165f362735525ebb33 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Tue, 21 Jan 2025 16:53:52 +0100 Subject: [PATCH 6/7] dynamic containerFile --- .konflux/scripts/rpm-prefetching/rpms.in.yaml | 4 +++- .konflux/scripts/update-rpm-lockfile.sh | 6 +++--- image/scanner/rhel/konflux.Dockerfile | 7 +------ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.konflux/scripts/rpm-prefetching/rpms.in.yaml b/.konflux/scripts/rpm-prefetching/rpms.in.yaml index 0bf8747ee..ec40315aa 100644 --- a/.konflux/scripts/rpm-prefetching/rpms.in.yaml +++ b/.konflux/scripts/rpm-prefetching/rpms.in.yaml @@ -2,7 +2,9 @@ packages: [xz] contentOrigin: repofiles: ["./ubi.repo"] context: - image: registry.access.redhat.com/ubi8-minimal:latest + containerfile: + file: ../../../image/scanner/rhel/konflux.Dockerfile + stageName: scanner-common arches: - aarch64 - ppc64le diff --git a/.konflux/scripts/update-rpm-lockfile.sh b/.konflux/scripts/update-rpm-lockfile.sh index 644ccb02e..282770db4 100755 --- a/.konflux/scripts/update-rpm-lockfile.sh +++ b/.konflux/scripts/update-rpm-lockfile.sh @@ -29,10 +29,10 @@ build_rpm_lockfile_runner_image() { run_rpm_lockfile_runner() { local container_dir=/work - podman run --rm -v "$(pwd)/${LOCAL_DIR}:${container_dir}" \ + podman run --rm -v "$(pwd):${container_dir}" \ "${RPM_LOCKFILE_RUNNER_IMAGE}" \ - --outfile=${container_dir}/rpms.lock.yaml \ - ${container_dir}/rpms.in.yaml + --outfile="${container_dir}/${LOCAL_DIR}/rpms.lock.yaml" \ + "${container_dir}/${LOCAL_DIR}/rpms.in.yaml" } fetch_ubi_repo_definitions diff --git a/image/scanner/rhel/konflux.Dockerfile b/image/scanner/rhel/konflux.Dockerfile index bf345d466..c24a0bd50 100644 --- a/image/scanner/rhel/konflux.Dockerfile +++ b/image/scanner/rhel/konflux.Dockerfile @@ -1,8 +1,3 @@ -ARG BASE_REGISTRY=registry.access.redhat.com -ARG BASE_IMAGE=ubi8-minimal -ARG BASE_TAG=latest - - # Compiling scanner binaries and staging repo2cpe and genesis manifests FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.22 AS builder @@ -35,7 +30,7 @@ COPY .konflux/scanner-data/blob-genesis_manifests.json image/scanner/dump/genesi # Common base for scanner slim and full -FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS scanner-common +FROM registry.access.redhat.com/ubi8-minimal:latest AS scanner-common ARG SCANNER_TAG From 9e04aceecac1287a4222fd3393321219dba09d8f Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Wed, 22 Jan 2025 12:39:05 +0100 Subject: [PATCH 7/7] remove disabled repositories from list --- .konflux/scripts/rpm-prefetching/ubi.repo | 50 ----------------------- 1 file changed, 50 deletions(-) diff --git a/.konflux/scripts/rpm-prefetching/ubi.repo b/.konflux/scripts/rpm-prefetching/ubi.repo index bdc28e0a6..ed37785b6 100644 --- a/.konflux/scripts/rpm-prefetching/ubi.repo +++ b/.konflux/scripts/rpm-prefetching/ubi.repo @@ -5,20 +5,6 @@ enabled = 1 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -[ubi-8-baseos-debug-rpms] -name = Red Hat Universal Base Image 8 (Debug RPMs) - BaseOS -baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/baseos/debug -enabled = 0 -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release -gpgcheck = 1 - -[ubi-8-baseos-source] -name = Red Hat Universal Base Image 8 (Source RPMs) - BaseOS -baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/baseos/source/SRPMS -enabled = 0 -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release -gpgcheck = 1 - [ubi-8-appstream-rpms] name = Red Hat Universal Base Image 8 (RPMs) - AppStream baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/appstream/os @@ -26,45 +12,9 @@ enabled = 1 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -[ubi-8-appstream-debug-rpms] -name = Red Hat Universal Base Image 8 (Debug RPMs) - AppStream -baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/appstream/debug -enabled = 0 -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release -gpgcheck = 1 - -[ubi-8-appstream-source] -name = Red Hat Universal Base Image 8 (Source RPMs) - AppStream -baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/appstream/source/SRPMS -enabled = 0 -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release -gpgcheck = 1 - [ubi-8-codeready-builder-rpms] name = Red Hat Universal Base Image 8 (RPMs) - CodeReady Builder baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/codeready-builder/os enabled = 1 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 - -[ubi-8-codeready-builder] -name = Red Hat Universal Base Image 8 (RPMs) - CodeReady Builder -baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/codeready-builder/os -enabled = 0 -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release -gpgcheck = 1 - - -[ubi-8-codeready-builder-debug-rpms] -name = Red Hat Universal Base Image 8 (Debug RPMs) - CodeReady Builder -baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/codeready-builder/debug -enabled = 0 -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release -gpgcheck = 1 - -[ubi-8-codeready-builder-source] -name = Red Hat Universal Base Image 8 (Source RPMs) - CodeReady Builder -baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/$basearch/codeready-builder/source/SRPMS -enabled = 0 -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release -gpgcheck = 1