Skip to content

MULTIARCH-6035: Add release pre and final pipelineruns #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
May 20, 2026
Merged

MULTIARCH-6035: Add release pre and final pipelineruns #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96be95c
Add run-script task to multi-arch build pipeline
AnnaZivkovic May 1, 2026
43693cd
Update Cel in operator on-push to run every time the bundle on-push runs
AnnaZivkovic May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
847 changes: 847 additions & 0 deletions .tekton/fbc-update-final-pipeline.yaml
View file
Open in desktop

Large diffs are not rendered by default.

60 changes: 52 additions & 8 deletions .tekton/multi-arch-build-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,47 @@ spec:
workspace: git-auth
- name: netrc
workspace: netrc
- name: run-script
params:
- name: ociStorage
value: $(params.output-image).script
- name: ociArtifactExpiresAfter
value: $(params.image-expires-after)
- name: SCRIPT_RUNNER_IMAGE
value: registry.access.redhat.com/ubi9/go-toolset:1.25
- name: SCRIPT
value: |
COMMIT_MSG=$(git log -1 --format=%s)

# Check if this commit requests clean version
if [[ "$COMMIT_MSG" =~ \[clean-version\] ]]; then
VERSION=$(grep -E "^VERSION \?=" Makefile | awk '{print $3}')
echo "Clean version requested: $VERSION"
export VERSION
else
# Normal commit - generate commit-based version
BASE_VERSION=$(grep -E "^VERSION \?=" Makefile | awk '{print $3}')
COMMIT_SHA=$(tasks.clone-repository.results.commit)
export VERSION="${BASE_VERSION}+${COMMIT_SHA:0:7}"
echo "Generated commit-based version: $VERSION"
fi

exec ./hack/bump-version.sh
- name: HERMETIC
value: "true"
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
runAfter:
- prefetch-dependencies
taskRef:
params:
- name: name
value: run-script-oci-ta
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-run-script-oci-ta:0.1@sha256:0e13a74cc02c945e7119ecd4cc0c9148e7591b50f87e415b212154caad0479c0
- name: kind
value: task
resolver: bundles
- matrix:
params:
- name: PLATFORM
Expand Down Expand Up @@ -208,13 +249,16 @@ spec:
- name: NO_PROXY
value: $(tasks.init.results.no-proxy)
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
value: $(tasks.run-script.results.SCRIPT_ARTIFACT)
- name: CACHI2_ARTIFACT
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
- name: ADDITIONAL_BASE_IMAGES
value:
- $(tasks.run-script.results.SCRIPT_RUNNER_IMAGE_REFERENCE)
- name: IMAGE_APPEND_PLATFORM
value: "true"
runAfter:
- prefetch-dependencies
- run-script
taskRef:
params:
- name: name
Expand Down Expand Up @@ -254,7 +298,7 @@ spec:
- name: BINARY_IMAGE_DIGEST
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
value: $(tasks.run-script.results.SCRIPT_ARTIFACT)
- name: CACHI2_ARTIFACT
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
runAfter:
Expand Down Expand Up @@ -355,7 +399,7 @@ spec:
- name: image-url
value: $(tasks.build-image-index.results.IMAGE_URL)
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
value: $(tasks.run-script.results.SCRIPT_ARTIFACT)
- name: CACHI2_ARTIFACT
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
- name: TARGET_DIRS
Expand Down Expand Up @@ -430,7 +474,7 @@ spec:
- name: BUILD_ARGS_FILE
value: $(params.build-args-file)
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
value: $(tasks.run-script.results.SCRIPT_ARTIFACT)
- name: CACHI2_ARTIFACT
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
- name: TARGET_DIRS
Expand Down Expand Up @@ -480,7 +524,7 @@ spec:
- name: image-url
value: $(tasks.build-image-index.results.IMAGE_URL)
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
value: $(tasks.run-script.results.SCRIPT_ARTIFACT)
- name: CACHI2_ARTIFACT
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
- name: TARGET_DIRS
Expand Down Expand Up @@ -509,7 +553,7 @@ spec:
- name: image-url
value: $(tasks.build-image-index.results.IMAGE_URL)
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
value: $(tasks.run-script.results.SCRIPT_ARTIFACT)
- name: CACHI2_ARTIFACT
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
- name: TARGET_DIRS
Expand Down Expand Up @@ -559,7 +603,7 @@ spec:
- name: CONTEXT
value: $(params.path-context)
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
value: $(tasks.run-script.results.SCRIPT_ARTIFACT)
runAfter:
- build-image-index
taskRef:
Expand Down
2 changes: 1 addition & 1 deletion .tekton/multiarch-tuning-operator-pull-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: |
event == "pull_request" && target_branch == "main" && (".tekton/***".pathChanged() || "api/***".pathChanged() || "internal/controller/***".pathChanged() || "pkg/***".pathChanged() || "test/***".pathChanged() || "konflux.Dockerfile".pathChanged() || "go.mod".pathChanged() || "cmd/***".pathChanged() || "go.sum".pathChanged() || "trigger-konflux-builds.txt".pathChanged() )
event == "pull_request" && target_branch == "main" && (".tekton/***".pathChanged() || "api/***".pathChanged() || "internal/***".pathChanged() || "pkg/***".pathChanged() || "test/***".pathChanged() || "konflux.Dockerfile".pathChanged() || "go.mod".pathChanged() || "cmd/***".pathChanged() || "go.sum".pathChanged() || "trigger-konflux-builds.txt".pathChanged() )
creationTimestamp: null
labels:
appstudio.openshift.io/application: multiarch-tuning-operator
Expand Down
6 changes: 3 additions & 3 deletions .tekton/multiarch-tuning-operator-push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && (".tekton/***".pathChanged() || "api/***".pathChanged() || "internal/controller/***".pathChanged()
== "main" && (".tekton/***".pathChanged() || "api/***".pathChanged() || "internal/***".pathChanged()
|| "pkg/***".pathChanged() || "test/***".pathChanged() || "konflux.Dockerfile".pathChanged()
|| "go.mod".pathChanged() || "cmd/***".pathChanged() || "go.sum".pathChanged()
|| "trigger-konflux-builds.txt".pathChanged() )
|| "go.mod".pathChanged() || "cmd/***".pathChanged() || "go.sum".pathChanged() || "bundle/***".pathChanged() ||
"bundle.konflux.Dockerfile".pathChanged() || "trigger-konflux-builds.txt".pathChanged() )
creationTimestamp: null
labels:
appstudio.openshift.io/application: multiarch-tuning-operator
Expand Down
16 changes: 15 additions & 1 deletion .tekton/single-arch-build-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,21 @@ spec:
value: registry.access.redhat.com/ubi9/go-toolset:1.25
- name: SCRIPT
value: |
export COMMIT_SHA="$(tasks.clone-repository.results.commit)"
COMMIT_MSG=$(git log -1 --format=%s)

# Check if this commit requests clean version
if [[ "$COMMIT_MSG" =~ \[clean-version\] ]]; then
VERSION=$(grep -E "^VERSION \?=" Makefile | awk '{print $3}')
echo "Clean version requested: $VERSION"
export VERSION
else
# Normal commit - generate commit-based version
BASE_VERSION=$(grep -E "^VERSION \?=" Makefile | awk '{print $3}')
COMMIT_SHA=$(tasks.clone-repository.results.commit)
export VERSION="${BASE_VERSION}+${COMMIT_SHA:0:7}"
echo "Generated commit-based version: $VERSION"
fi

exec ./hack/bump-version.sh
- name: HERMETIC
value: "true"
Expand Down
Loading