Skip to content
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

ROX-27384: Use the updated determine-image-tag task #1771

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+20 −58
Open

ROX-27384: Use the updated determine-image-tag task #1771

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66727ca
Delete `fail-build-if-git-is-dirty.sh`
msugakov Jan 16, 2025
62ac9ac
Update pipeline CEL expression
msugakov Jan 16, 2025
62da3ff
Use updated `determine-image-tag` task
msugakov Jan 16, 2025
71d547a
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
34 changes: 0 additions & 34 deletions .konflux/scripts/fail-build-if-git-is-dirty.sh
View file
Open in desktop

This file was deleted.

9 changes: 4 additions & 5 deletions .tekton/scanner-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
5 changes: 4 additions & 1 deletion .tekton/scanner-component-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,15 @@ 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
- name: bundle
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:098fb3f43bd32d61874e67adc830cae0845f59fbc06cb52ddcc820f5c2c8be2d
# TODO(ROX-27384): use latest
value: quay.io/rhacs-eng/konflux-tasks:pr-16@sha256:9ddc1cc53cc8827304d3cdf1e041759b74497ff914c6b5522de953aeb487bc6f
- name: kind
value: task
resolver: bundles
Expand Down
9 changes: 4 additions & 5 deletions .tekton/scanner-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/scanner-db-slim-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-slim-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
2 changes: 0 additions & 2 deletions image/scanner/rhel/konflux.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ ENV CI=1
COPY . /src
WORKDIR /src

RUN .konflux/scripts/fail-build-if-git-is-dirty.sh

RUN unzip -j .konflux/scanner-data/blob-repo2cpe.zip -d image/scanner/dump/repo2cpe && \
unzip -j .konflux/scanner-data/blob-k8s-definitions.zip -d image/scanner/dump/k8s_definitions && \
unzip -j .konflux/scanner-data/blob-nvd-definitions.zip -d image/scanner/dump/nvd_definitions
Expand Down
Loading