Skip to content

ROX-27384: Use the updated determine-*image-tag tasks #13850

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
msugakov merged 3 commits into from
Jan 20, 2025
Merged

ROX-27384: Use the updated determine-*image-tag tasks #13850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98f045d
Update pipelines CEL expressions
msugakov Jan 16, 2025
2d5191c
Switch to the new versions of tasks
msugakov Jan 16, 2025
1d27620
Switch to the latest tasks bundle
msugakov Jan 17, 2025
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
6 changes: 4 additions & 2 deletions .tekton/basic-component-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,14 @@ spec:
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
- name: MAKEFILE_DIRECTORY
value: $(params.image-tag-makefile-directory)
- name: SOURCE_BRANCH
value: '{{source_branch}}'
taskRef:
params:
- name: name
value: determine-image-tag-stackrox
value: determine-image-tag
- name: bundle
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:098fb3f43bd32d61874e67adc830cae0845f59fbc06cb52ddcc820f5c2c8be2d
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:7b7c2f3c1a73190d50f3d2ce68077f44981596f491a52b5d7450a2f717050a11
- name: kind
value: task
resolver: bundles
Expand Down
9 changes: 4 additions & 5 deletions .tekton/central-db-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "500"
# TODO(ROX-21073): re-enable for all PR branches
pipelinesascode.tekton.dev/on-cel-expression: (
event == "push" && (
source_branch == "master" ||
target_branch.startsWith("refs/tags/")
)
pipelinesascode.tekton.dev/on-cel-expression: |
(
event == "push" && target_branch.matches("^(master|release-.*|refs/tags/.*)$")
) || (
event == "pull_request" && (
target_branch.startsWith("release-") ||
source_branch.matches("(konflux|renovate|appstudio|rhtap)") ||
body.pull_request.labels.exists(l, l.name == "konflux-build")
)
Expand Down
9 changes: 4 additions & 5 deletions .tekton/main-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "500"
# TODO(ROX-21073): re-enable for all PR branches
pipelinesascode.tekton.dev/on-cel-expression: (
event == "push" && (
source_branch == "master" ||
target_branch.startsWith("refs/tags/")
)
pipelinesascode.tekton.dev/on-cel-expression: |
(
event == "push" && target_branch.matches("^(master|release-.*|refs/tags/.*)$")
) || (
event == "pull_request" && (
target_branch.startsWith("release-") ||
source_branch.matches("(konflux|renovate|appstudio|rhtap)") ||
body.pull_request.labels.exists(l, l.name == "konflux-build")
)
Expand Down
8 changes: 5 additions & 3 deletions .tekton/main-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,14 @@ spec:
value: $(params.output-tag-suffix)
- name: SOURCE_ARTIFACT
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
- name: SOURCE_BRANCH
value: '{{source_branch}}'
taskRef:
params:
- name: name
value: determine-image-tag-stackrox
value: determine-image-tag
- name: bundle
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:098fb3f43bd32d61874e67adc830cae0845f59fbc06cb52ddcc820f5c2c8be2d
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:7b7c2f3c1a73190d50f3d2ce68077f44981596f491a52b5d7450a2f717050a11
- name: kind
value: task
resolver: bundles
Expand All @@ -204,7 +206,7 @@ spec:
- name: name
value: fetch-external-networks
- name: bundle
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:098fb3f43bd32d61874e67adc830cae0845f59fbc06cb52ddcc820f5c2c8be2d
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:7b7c2f3c1a73190d50f3d2ce68077f44981596f491a52b5d7450a2f717050a11
- name: kind
value: task
resolver: bundles
Expand Down
9 changes: 4 additions & 5 deletions .tekton/operator-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "500"
# TODO(ROX-21073): re-enable for all PR branches
pipelinesascode.tekton.dev/on-cel-expression: (
event == "push" && (
source_branch == "master" ||
target_branch.startsWith("refs/tags/")
)
pipelinesascode.tekton.dev/on-cel-expression: |
(
event == "push" && target_branch.matches("^(master|release-.*|refs/tags/.*)$")
) || (
event == "pull_request" && (
target_branch.startsWith("release-") ||
source_branch.matches("(konflux|renovate|appstudio|rhtap)") ||
body.pull_request.labels.exists(l, l.name == "konflux-build")
)
Expand Down
9 changes: 4 additions & 5 deletions .tekton/operator-bundle-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "500"
# TODO(ROX-21073): re-enable for all PR branches
pipelinesascode.tekton.dev/on-cel-expression: (
event == "push" && (
source_branch == "master" ||
target_branch.startsWith("refs/tags/")
)
pipelinesascode.tekton.dev/on-cel-expression: |
(
event == "push" && target_branch.matches("^(master|release-.*|refs/tags/.*)$")
) || (
event == "pull_request" && (
target_branch.startsWith("release-") ||
source_branch.matches("(konflux|renovate|appstudio|rhtap)") ||
body.pull_request.labels.exists(l, l.name == "konflux-build")
)
Expand Down
12 changes: 8 additions & 4 deletions .tekton/operator-bundle-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,12 +292,14 @@ spec:
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
- name: MAKEFILE_DIRECTORY
value: ./operator
- name: SOURCE_BRANCH
value: '{{source_branch}}'
taskRef: &determine-image-tag-ref
params:
- name: name
value: determine-image-tag-stackrox
value: determine-image-tag
- name: bundle
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:098fb3f43bd32d61874e67adc830cae0845f59fbc06cb52ddcc820f5c2c8be2d
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:7b7c2f3c1a73190d50f3d2ce68077f44981596f491a52b5d7450a2f717050a11
- name: kind
value: task
resolver: bundles
Expand All @@ -310,6 +312,8 @@ spec:
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
- name: MAKEFILE_DIRECTORY
value: "."
- name: SOURCE_BRANCH
value: '{{source_branch}}'
taskRef: *determine-image-tag-ref

- name: prefetch-dependencies
Expand Down Expand Up @@ -344,7 +348,7 @@ spec:
- name: name
value: wait-for-image
- name: bundle
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:098fb3f43bd32d61874e67adc830cae0845f59fbc06cb52ddcc820f5c2c8be2d
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:7b7c2f3c1a73190d50f3d2ce68077f44981596f491a52b5d7450a2f717050a11
- name: kind
value: task
resolver: bundles
Expand Down Expand Up @@ -782,7 +786,7 @@ spec:
- name: name
value: create-snapshot
- name: bundle
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:098fb3f43bd32d61874e67adc830cae0845f59fbc06cb52ddcc820f5c2c8be2d
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:7b7c2f3c1a73190d50f3d2ce68077f44981596f491a52b5d7450a2f717050a11
- name: kind
value: task
resolver: bundles
11 changes: 9 additions & 2 deletions .tekton/retag-collector-full.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,15 @@ metadata:
pipelinesascode.tekton.dev/max-keep-runs: "500"
# TODO(ROX-21073): re-enable for all PR branches
pipelinesascode.tekton.dev/on-cel-expression: |
(event == "push" && target_branch.matches("^(master|release-.*)$")) ||
(event == "pull_request" && (source_branch.matches("(konflux|renovate|appstudio|rhtap)") || body.pull_request.labels.exists(l, l.name == "konflux-build")))
(
event == "push" && target_branch.matches("^(master|release-.*|refs/tags/.*)$")
) || (
event == "pull_request" && (
target_branch.startsWith("release-") ||
source_branch.matches("(konflux|renovate|appstudio|rhtap)") ||
body.pull_request.labels.exists(l, l.name == "konflux-build")
)
)
labels:
appstudio.openshift.io/application: acs
name: retag-collector-full
Expand Down
11 changes: 9 additions & 2 deletions .tekton/retag-collector-slim.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,15 @@ metadata:
pipelinesascode.tekton.dev/max-keep-runs: "500"
# TODO(ROX-21073): re-enable for all PR branches
pipelinesascode.tekton.dev/on-cel-expression: |
(event == "push" && target_branch.matches("^(master|release-.*)$")) ||
(event == "pull_request" && (source_branch.matches("(konflux|renovate|appstudio|rhtap)") || body.pull_request.labels.exists(l, l.name == "konflux-build")))
(
event == "push" && target_branch.matches("^(master|release-.*|refs/tags/.*)$")
) || (
event == "pull_request" && (
target_branch.startsWith("release-") ||
source_branch.matches("(konflux|renovate|appstudio|rhtap)") ||
body.pull_request.labels.exists(l, l.name == "konflux-build")
)
)
labels:
appstudio.openshift.io/application: acs
name: retag-collector-slim
Expand Down
22 changes: 15 additions & 7 deletions .tekton/retag-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,18 +110,18 @@ spec:

- name: determine-output-image-tag
params:
- name: MAKEFILE_TARGET
value: "tag"
- name: TAG_SUFFIX
value: $(params.image-tag-suffix)
- name: SOURCE_ARTIFACT
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
taskRef: &determine-image-tag-ref
- name: SOURCE_BRANCH
value: '{{source_branch}}'
taskRef:
params:
- name: name
value: determine-image-tag-stackrox
value: determine-image-tag
- name: bundle
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:098fb3f43bd32d61874e67adc830cae0845f59fbc06cb52ddcc820f5c2c8be2d
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:7b7c2f3c1a73190d50f3d2ce68077f44981596f491a52b5d7450a2f717050a11
- name: kind
value: task
resolver: bundles
Expand All @@ -134,7 +134,15 @@ spec:
value: $(params.image-tag-suffix)
- name: SOURCE_ARTIFACT
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
taskRef: *determine-image-tag-ref
taskRef:
params:
- name: name
value: determine-dependency-image-tag
- name: bundle
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:7b7c2f3c1a73190d50f3d2ce68077f44981596f491a52b5d7450a2f717050a11
- name: kind
value: task
resolver: bundles

- name: retag-image
params:
Expand All @@ -151,7 +159,7 @@ spec:
- name: name
value: retag-image
- name: bundle
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:098fb3f43bd32d61874e67adc830cae0845f59fbc06cb52ddcc820f5c2c8be2d
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:7b7c2f3c1a73190d50f3d2ce68077f44981596f491a52b5d7450a2f717050a11
- name: kind
value: task
resolver: bundles
11 changes: 9 additions & 2 deletions .tekton/retag-scanner-db-slim.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,15 @@ metadata:
pipelinesascode.tekton.dev/max-keep-runs: "500"
# TODO(ROX-21073): re-enable for all PR branches
pipelinesascode.tekton.dev/on-cel-expression: |
(event == "push" && target_branch.matches("^(master|release-.*)$")) ||
(event == "pull_request" && (source_branch.matches("(konflux|renovate|appstudio|rhtap)") || body.pull_request.labels.exists(l, l.name == "konflux-build")))
(
event == "push" && target_branch.matches("^(master|release-.*|refs/tags/.*)$")
) || (
event == "pull_request" && (
target_branch.startsWith("release-") ||
source_branch.matches("(konflux|renovate|appstudio|rhtap)") ||
body.pull_request.labels.exists(l, l.name == "konflux-build")
)
)
labels:
appstudio.openshift.io/application: acs
name: retag-scanner-db-slim
Expand Down
11 changes: 9 additions & 2 deletions .tekton/retag-scanner-db.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,15 @@ metadata:
pipelinesascode.tekton.dev/max-keep-runs: "500"
# TODO(ROX-21073): re-enable for all PR branches
pipelinesascode.tekton.dev/on-cel-expression: |
(event == "push" && target_branch.matches("^(master|release-.*)$")) ||
(event == "pull_request" && (source_branch.matches("(konflux|renovate|appstudio|rhtap)") || body.pull_request.labels.exists(l, l.name == "konflux-build")))
(
event == "push" && target_branch.matches("^(master|release-.*|refs/tags/.*)$")
) || (
event == "pull_request" && (
target_branch.startsWith("release-") ||
source_branch.matches("(konflux|renovate|appstudio|rhtap)") ||
body.pull_request.labels.exists(l, l.name == "konflux-build")
)
)
labels:
appstudio.openshift.io/application: acs
name: retag-scanner-db
Expand Down
11 changes: 9 additions & 2 deletions .tekton/retag-scanner-slim.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,15 @@ metadata:
pipelinesascode.tekton.dev/max-keep-runs: "500"
# TODO(ROX-21073): re-enable for all PR branches
pipelinesascode.tekton.dev/on-cel-expression: |
(event == "push" && target_branch.matches("^(master|release-.*)$")) ||
(event == "pull_request" && (source_branch.matches("(konflux|renovate|appstudio|rhtap)") || body.pull_request.labels.exists(l, l.name == "konflux-build")))
(
event == "push" && target_branch.matches("^(master|release-.*|refs/tags/.*)$")
) || (
event == "pull_request" && (
target_branch.startsWith("release-") ||
source_branch.matches("(konflux|renovate|appstudio|rhtap)") ||
body.pull_request.labels.exists(l, l.name == "konflux-build")
)
)
labels:
appstudio.openshift.io/application: acs
name: retag-scanner-slim
Expand Down
11 changes: 9 additions & 2 deletions .tekton/retag-scanner.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,15 @@ metadata:
pipelinesascode.tekton.dev/max-keep-runs: "500"
# TODO(ROX-21073): re-enable for all PR branches
pipelinesascode.tekton.dev/on-cel-expression: |
(event == "push" && target_branch.matches("^(master|release-.*)$")) ||
(event == "pull_request" && (source_branch.matches("(konflux|renovate|appstudio|rhtap)") || body.pull_request.labels.exists(l, l.name == "konflux-build")))
(
event == "push" && target_branch.matches("^(master|release-.*|refs/tags/.*)$")
) || (
event == "pull_request" && (
target_branch.startsWith("release-") ||
source_branch.matches("(konflux|renovate|appstudio|rhtap)") ||
body.pull_request.labels.exists(l, l.name == "konflux-build")
)
)
labels:
appstudio.openshift.io/application: acs
name: retag-scanner
Expand Down
9 changes: 4 additions & 5 deletions .tekton/roxctl-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "500"
# TODO(ROX-21073): re-enable for all PR branches
pipelinesascode.tekton.dev/on-cel-expression: (
event == "push" && (
source_branch == "master" ||
target_branch.startsWith("refs/tags/")
)
pipelinesascode.tekton.dev/on-cel-expression: |
(
event == "push" && target_branch.matches("^(master|release-.*|refs/tags/.*)$")
) || (
event == "pull_request" && (
target_branch.startsWith("release-") ||
source_branch.matches("(konflux|renovate|appstudio|rhtap)") ||
body.pull_request.labels.exists(l, l.name == "konflux-build")
)
Expand Down
9 changes: 4 additions & 5 deletions .tekton/scanner-v4-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "500"
# TODO(ROX-21073): re-enable for all PR branches
pipelinesascode.tekton.dev/on-cel-expression: (
event == "push" && (
source_branch == "master" ||
target_branch.startsWith("refs/tags/")
)
pipelinesascode.tekton.dev/on-cel-expression: |
(
event == "push" && target_branch.matches("^(master|release-.*|refs/tags/.*)$")
) || (
event == "pull_request" && (
target_branch.startsWith("release-") ||
source_branch.matches("(konflux|renovate|appstudio|rhtap)") ||
body.pull_request.labels.exists(l, l.name == "konflux-build")
)
Expand Down
9 changes: 4 additions & 5 deletions .tekton/scanner-v4-db-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "500"
# TODO(ROX-21073): re-enable for all PR branches
pipelinesascode.tekton.dev/on-cel-expression: (
event == "push" && (
source_branch == "master" ||
target_branch.startsWith("refs/tags/")
)
pipelinesascode.tekton.dev/on-cel-expression: |
(
event == "push" && target_branch.matches("^(master|release-.*|refs/tags/.*)$")
) || (
event == "pull_request" && (
target_branch.startsWith("release-") ||
source_branch.matches("(konflux|renovate|appstudio|rhtap)") ||
body.pull_request.labels.exists(l, l.name == "konflux-build")
)
Expand Down
8 changes: 5 additions & 3 deletions .tekton/scanner-v4-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,14 @@ spec:
value: $(params.output-tag-suffix)
- name: SOURCE_ARTIFACT
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
- name: SOURCE_BRANCH
value: '{{source_branch}}'
taskRef:
params:
- name: name
value: determine-image-tag-stackrox
value: determine-image-tag
- name: bundle
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:098fb3f43bd32d61874e67adc830cae0845f59fbc06cb52ddcc820f5c2c8be2d
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:7b7c2f3c1a73190d50f3d2ce68077f44981596f491a52b5d7450a2f717050a11
- name: kind
value: task
resolver: bundles
Expand All @@ -204,7 +206,7 @@ spec:
- name: name
value: fetch-scanner-v4-vuln-mappings
- name: bundle
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:098fb3f43bd32d61874e67adc830cae0845f59fbc06cb52ddcc820f5c2c8be2d
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:7b7c2f3c1a73190d50f3d2ce68077f44981596f491a52b5d7450a2f717050a11
- name: kind
value: task
resolver: bundles
Expand Down