Skip to content

Commit 6738eed

Browse files
committed
set hermetic=false for fbc
1 parent a69d219 commit 6738eed

File tree

8 files changed

+31
-5
lines changed

8 files changed

+31
-5
lines changed

.konflux/catalog/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
openperouter-operator/catalog.yaml
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
quay: quay.io/redhat-user-workloads/telco-5g-tenant/openperouter-operator-bundle-4-20@sha256:73fd94db7cacbe18a9c384d2947358f6fd69fa2ac3e9ba883d04daa9a06797b3
3+

.konflux/catalog/catalog-template.in.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
entries:
3-
- defaultChannel: stable
3+
- defaultChannel: alpha
44
name: openperouter-operator
55
schema: olm.package
66
# Add 'replaces' after we ship 4.20.0
77
- entries:
88
- name: openperouter-operator.v4.20.0
99
skipRange: '>=4.9.0 <4.20.0'
10-
name: stable
10+
name: alpha
1111
package: openperouter-operator
1212
schema: olm.channel
1313
- entries:
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# We use this IDMS to check if the images in the FBC are resolvable using the staging or production catalog.
2+
# https://github.com/konflux-ci/community-catalog/tree/development/pipelines/validate-fbc-images-resolvable
3+
apiVersion: operator.openshift.io/v1
4+
kind: ImageDigestMirrorSet
5+
metadata:
6+
name: fbc-images-resolvable-integration-test-idms
7+
spec:
8+
imageDigestMirrors:
9+
- mirrors:
10+
- registry.stage.redhat.io/openshift4-dev-preview-beta/openperouter-rhel9-operator
11+
source: registry.redhat.io/openshift4-dev-preview-beta/openperouter-rhel9-operator
12+
- mirrors:
13+
- registry.stage.redhat.io/openshift4-dev-preview-beta/openperouter-operator-bundle
14+
source: registry.redhat.io/openshift4-dev-preview-beta/openperouter-operator-bundle

.konflux/catalog/openperouter-operator/.gitkeep

Whitespace-only changes.

.tekton/openperouter-operator-fbc-4-20-pull-request.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ spec:
3232
- linux/x86_64
3333
- name: dockerfile
3434
value: .konflux/Dockerfile.catalog
35+
# We have configured an fbc exception for hermetic builds on the release repo.
36+
- name: hermetic
37+
value: "false"
3538
pipelineSpec:
3639
description: |
3740
This pipeline is ideal for building and verifying [file-based catalogs](https://konflux-ci.dev/docs/end-to-end/building-olm/#building-the-file-based-catalog).

.tekton/openperouter-operator-fbc-4-20-push.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ spec:
2929
- linux/x86_64
3030
- name: dockerfile
3131
value: .konflux/catalog/Dockerfile.catalog
32+
# We have configured an fbc exception for hermetic builds on the release repo.
33+
- name: hermetic
34+
value: "false"
3235
pipelineSpec:
3336
description: |
3437
This pipeline is ideal for building and verifying [file-based catalogs](https://konflux-ci.dev/docs/end-to-end/building-olm/#building-the-file-based-catalog).

konflux.Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,16 @@ YQ ?= $(LOCALBIN)/yq
3030
yq: ## Download yq locally if necessary
3131
@echo "Downloading yq..."
3232
$(MAKE) -C $(PROJECT_DIR)/telco5g-konflux/scripts/download download-yq DOWNLOAD_INSTALL_DIR=$(PROJECT_DIR)/bin
33-
yq --version
33+
$(YQ) --version
34+
@cp $(YQ) /usr/bin/yq
3435
@echo "Yq downloaded successfully."
3536

3637
.PHONY: yq-sort-and-format
3738
yq-sort-and-format: yq ## Sort keys/reformat all yaml files
3839
@echo "Sorting keys and reformatting YAML files..."
3940
@find . -name "*.yaml" -o -name "*.yml" | grep -v -E "(telco5g-konflux/|target/|vendor/|bin/|\.git/)" | while read file; do \
4041
echo "Processing $$file..."; \
41-
yq -i '.. |= sort_keys(.)' "$$file"; \
42+
$(YQ) -i '.. |= sort_keys(.)' "$$file"; \
4243
done
4344
@echo "YAML sorting and formatting completed successfully."
4445

@@ -53,7 +54,8 @@ opm: ## Download opm locally if necessary
5354
@$(MAKE) -C $(PROJECT_DIR)/telco5g-konflux/scripts/download download-opm \
5455
DOWNLOAD_INSTALL_DIR=$(PROJECT_DIR)/bin \
5556
DOWNLOAD_OPM_VERSION=$(OPM_VERSION)
56-
opm version
57+
$(OPM) version
58+
@cp $(OPM) /usr/bin/opm
5759
@echo "Opm downloaded successfully."
5860

5961
##@ Konflux

0 commit comments

Comments
 (0)