Skip to content

Commit 265cb55

Browse files
authored
Merge branch 'main' into remove-jbs-sbom-handling
2 parents 16f3c70 + 8278d06 commit 265cb55

28 files changed

+273
-352
lines changed

.github/workflows/java-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
restore-keys: |
1919
${{ runner.os }}-maven-
2020
- name: Set up JDK 17
21-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4
21+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4
2222
with:
2323
distribution: 'temurin'
2424
java-version: 17

.tekton/build-request-processor-pull-request.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ spec:
171171
- name: name
172172
value: git-clone
173173
- name: bundle
174-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:0bb1be8363557e8e07ec34a3c5daaaaa23c9d533f0bb12f00dc604d00de50814
174+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:2cccdf8729ad4d5adf65e8b66464f8efa1e1c87ba16d343b4a6c621a2a40f7e1
175175
- name: kind
176176
value: task
177177
resolver: bundles
@@ -240,7 +240,7 @@ spec:
240240
- name: name
241241
value: buildah
242242
- name: bundle
243-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:71d3bb81d1c7c9f99946b5f1d4844664f2036636fd114cf5232db644bc088981
243+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:2c3426a2a7ff46a413c56f8f18055f9385eb323d41e6e8cf1b9dd9d10013daaf
244244
- name: kind
245245
value: task
246246
resolver: bundles
@@ -356,7 +356,7 @@ spec:
356356
- name: name
357357
value: sast-snyk-check
358358
- name: bundle
359-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:06d9b14bed7c7f50593a289f723b074e3c0d6b025f74e61692224425713ece7e
359+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:69ae591831f0f96d31c85d360273c1ce436ae1dbbfa3d0b22a083cb228c9e82c
360360
- name: kind
361361
value: task
362362
resolver: bundles
@@ -381,7 +381,7 @@ spec:
381381
- name: name
382382
value: clamav-scan
383383
- name: bundle
384-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:37a2dcca17429a0e06f36a77c362d2f9b3cb4d0ad9c20393167bd740650a4657
384+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:5ac9b24cff7cfb391bc54cd5135536892090354862327d1028fa08872d759c03
385385
- name: kind
386386
value: task
387387
resolver: bundles

.tekton/build-request-processor-push.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ spec:
168168
- name: name
169169
value: git-clone
170170
- name: bundle
171-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:0bb1be8363557e8e07ec34a3c5daaaaa23c9d533f0bb12f00dc604d00de50814
171+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:2cccdf8729ad4d5adf65e8b66464f8efa1e1c87ba16d343b4a6c621a2a40f7e1
172172
- name: kind
173173
value: task
174174
resolver: bundles
@@ -237,7 +237,7 @@ spec:
237237
- name: name
238238
value: buildah
239239
- name: bundle
240-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:71d3bb81d1c7c9f99946b5f1d4844664f2036636fd114cf5232db644bc088981
240+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:2c3426a2a7ff46a413c56f8f18055f9385eb323d41e6e8cf1b9dd9d10013daaf
241241
- name: kind
242242
value: task
243243
resolver: bundles
@@ -353,7 +353,7 @@ spec:
353353
- name: name
354354
value: sast-snyk-check
355355
- name: bundle
356-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:06d9b14bed7c7f50593a289f723b074e3c0d6b025f74e61692224425713ece7e
356+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:69ae591831f0f96d31c85d360273c1ce436ae1dbbfa3d0b22a083cb228c9e82c
357357
- name: kind
358358
value: task
359359
resolver: bundles
@@ -378,7 +378,7 @@ spec:
378378
- name: name
379379
value: clamav-scan
380380
- name: bundle
381-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:37a2dcca17429a0e06f36a77c362d2f9b3cb4d0ad9c20393167bd740650a4657
381+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:5ac9b24cff7cfb391bc54cd5135536892090354862327d1028fa08872d759c03
382382
- name: kind
383383
value: task
384384
resolver: bundles

.tekton/cache-pull-request.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ spec:
171171
- name: name
172172
value: git-clone
173173
- name: bundle
174-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:0bb1be8363557e8e07ec34a3c5daaaaa23c9d533f0bb12f00dc604d00de50814
174+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:2cccdf8729ad4d5adf65e8b66464f8efa1e1c87ba16d343b4a6c621a2a40f7e1
175175
- name: kind
176176
value: task
177177
resolver: bundles
@@ -240,7 +240,7 @@ spec:
240240
- name: name
241241
value: buildah
242242
- name: bundle
243-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:71d3bb81d1c7c9f99946b5f1d4844664f2036636fd114cf5232db644bc088981
243+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:2c3426a2a7ff46a413c56f8f18055f9385eb323d41e6e8cf1b9dd9d10013daaf
244244
- name: kind
245245
value: task
246246
resolver: bundles
@@ -356,7 +356,7 @@ spec:
356356
- name: name
357357
value: sast-snyk-check
358358
- name: bundle
359-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:06d9b14bed7c7f50593a289f723b074e3c0d6b025f74e61692224425713ece7e
359+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:69ae591831f0f96d31c85d360273c1ce436ae1dbbfa3d0b22a083cb228c9e82c
360360
- name: kind
361361
value: task
362362
resolver: bundles
@@ -381,7 +381,7 @@ spec:
381381
- name: name
382382
value: clamav-scan
383383
- name: bundle
384-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:37a2dcca17429a0e06f36a77c362d2f9b3cb4d0ad9c20393167bd740650a4657
384+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:5ac9b24cff7cfb391bc54cd5135536892090354862327d1028fa08872d759c03
385385
- name: kind
386386
value: task
387387
resolver: bundles

.tekton/cache-push.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ spec:
168168
- name: name
169169
value: git-clone
170170
- name: bundle
171-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:0bb1be8363557e8e07ec34a3c5daaaaa23c9d533f0bb12f00dc604d00de50814
171+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:2cccdf8729ad4d5adf65e8b66464f8efa1e1c87ba16d343b4a6c621a2a40f7e1
172172
- name: kind
173173
value: task
174174
resolver: bundles
@@ -237,7 +237,7 @@ spec:
237237
- name: name
238238
value: buildah
239239
- name: bundle
240-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:71d3bb81d1c7c9f99946b5f1d4844664f2036636fd114cf5232db644bc088981
240+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:2c3426a2a7ff46a413c56f8f18055f9385eb323d41e6e8cf1b9dd9d10013daaf
241241
- name: kind
242242
value: task
243243
resolver: bundles
@@ -353,7 +353,7 @@ spec:
353353
- name: name
354354
value: sast-snyk-check
355355
- name: bundle
356-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:06d9b14bed7c7f50593a289f723b074e3c0d6b025f74e61692224425713ece7e
356+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:69ae591831f0f96d31c85d360273c1ce436ae1dbbfa3d0b22a083cb228c9e82c
357357
- name: kind
358358
value: task
359359
resolver: bundles
@@ -378,7 +378,7 @@ spec:
378378
- name: name
379379
value: clamav-scan
380380
- name: bundle
381-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:37a2dcca17429a0e06f36a77c362d2f9b3cb4d0ad9c20393167bd740650a4657
381+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:5ac9b24cff7cfb391bc54cd5135536892090354862327d1028fa08872d759c03
382382
- name: kind
383383
value: task
384384
resolver: bundles

.tekton/cli-pull-request.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ spec:
171171
- name: name
172172
value: git-clone
173173
- name: bundle
174-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:0bb1be8363557e8e07ec34a3c5daaaaa23c9d533f0bb12f00dc604d00de50814
174+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:2cccdf8729ad4d5adf65e8b66464f8efa1e1c87ba16d343b4a6c621a2a40f7e1
175175
- name: kind
176176
value: task
177177
resolver: bundles
@@ -240,7 +240,7 @@ spec:
240240
- name: name
241241
value: buildah
242242
- name: bundle
243-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:71d3bb81d1c7c9f99946b5f1d4844664f2036636fd114cf5232db644bc088981
243+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:2c3426a2a7ff46a413c56f8f18055f9385eb323d41e6e8cf1b9dd9d10013daaf
244244
- name: kind
245245
value: task
246246
resolver: bundles
@@ -356,7 +356,7 @@ spec:
356356
- name: name
357357
value: sast-snyk-check
358358
- name: bundle
359-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:06d9b14bed7c7f50593a289f723b074e3c0d6b025f74e61692224425713ece7e
359+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:69ae591831f0f96d31c85d360273c1ce436ae1dbbfa3d0b22a083cb228c9e82c
360360
- name: kind
361361
value: task
362362
resolver: bundles
@@ -381,7 +381,7 @@ spec:
381381
- name: name
382382
value: clamav-scan
383383
- name: bundle
384-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:37a2dcca17429a0e06f36a77c362d2f9b3cb4d0ad9c20393167bd740650a4657
384+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:5ac9b24cff7cfb391bc54cd5135536892090354862327d1028fa08872d759c03
385385
- name: kind
386386
value: task
387387
resolver: bundles

.tekton/cli-push.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ spec:
168168
- name: name
169169
value: git-clone
170170
- name: bundle
171-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:0bb1be8363557e8e07ec34a3c5daaaaa23c9d533f0bb12f00dc604d00de50814
171+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:2cccdf8729ad4d5adf65e8b66464f8efa1e1c87ba16d343b4a6c621a2a40f7e1
172172
- name: kind
173173
value: task
174174
resolver: bundles
@@ -237,7 +237,7 @@ spec:
237237
- name: name
238238
value: buildah
239239
- name: bundle
240-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:71d3bb81d1c7c9f99946b5f1d4844664f2036636fd114cf5232db644bc088981
240+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:2c3426a2a7ff46a413c56f8f18055f9385eb323d41e6e8cf1b9dd9d10013daaf
241241
- name: kind
242242
value: task
243243
resolver: bundles
@@ -353,7 +353,7 @@ spec:
353353
- name: name
354354
value: sast-snyk-check
355355
- name: bundle
356-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:06d9b14bed7c7f50593a289f723b074e3c0d6b025f74e61692224425713ece7e
356+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:69ae591831f0f96d31c85d360273c1ce436ae1dbbfa3d0b22a083cb228c9e82c
357357
- name: kind
358358
value: task
359359
resolver: bundles
@@ -378,7 +378,7 @@ spec:
378378
- name: name
379379
value: clamav-scan
380380
- name: bundle
381-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:37a2dcca17429a0e06f36a77c362d2f9b3cb4d0ad9c20393167bd740650a4657
381+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:5ac9b24cff7cfb391bc54cd5135536892090354862327d1028fa08872d759c03
382382
- name: kind
383383
value: task
384384
resolver: bundles

.tekton/controller-pull-request.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ spec:
169169
- name: name
170170
value: git-clone
171171
- name: bundle
172-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:0bb1be8363557e8e07ec34a3c5daaaaa23c9d533f0bb12f00dc604d00de50814
172+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:2cccdf8729ad4d5adf65e8b66464f8efa1e1c87ba16d343b4a6c621a2a40f7e1
173173
- name: kind
174174
value: task
175175
resolver: bundles
@@ -238,7 +238,7 @@ spec:
238238
- name: name
239239
value: buildah
240240
- name: bundle
241-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:71d3bb81d1c7c9f99946b5f1d4844664f2036636fd114cf5232db644bc088981
241+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:2c3426a2a7ff46a413c56f8f18055f9385eb323d41e6e8cf1b9dd9d10013daaf
242242
- name: kind
243243
value: task
244244
resolver: bundles
@@ -354,7 +354,7 @@ spec:
354354
- name: name
355355
value: sast-snyk-check
356356
- name: bundle
357-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:06d9b14bed7c7f50593a289f723b074e3c0d6b025f74e61692224425713ece7e
357+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:69ae591831f0f96d31c85d360273c1ce436ae1dbbfa3d0b22a083cb228c9e82c
358358
- name: kind
359359
value: task
360360
resolver: bundles
@@ -379,7 +379,7 @@ spec:
379379
- name: name
380380
value: clamav-scan
381381
- name: bundle
382-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:37a2dcca17429a0e06f36a77c362d2f9b3cb4d0ad9c20393167bd740650a4657
382+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:5ac9b24cff7cfb391bc54cd5135536892090354862327d1028fa08872d759c03
383383
- name: kind
384384
value: task
385385
resolver: bundles

.tekton/controller-push.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ spec:
166166
- name: name
167167
value: git-clone
168168
- name: bundle
169-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:0bb1be8363557e8e07ec34a3c5daaaaa23c9d533f0bb12f00dc604d00de50814
169+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:2cccdf8729ad4d5adf65e8b66464f8efa1e1c87ba16d343b4a6c621a2a40f7e1
170170
- name: kind
171171
value: task
172172
resolver: bundles
@@ -235,7 +235,7 @@ spec:
235235
- name: name
236236
value: buildah
237237
- name: bundle
238-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:71d3bb81d1c7c9f99946b5f1d4844664f2036636fd114cf5232db644bc088981
238+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:2c3426a2a7ff46a413c56f8f18055f9385eb323d41e6e8cf1b9dd9d10013daaf
239239
- name: kind
240240
value: task
241241
resolver: bundles
@@ -351,7 +351,7 @@ spec:
351351
- name: name
352352
value: sast-snyk-check
353353
- name: bundle
354-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:06d9b14bed7c7f50593a289f723b074e3c0d6b025f74e61692224425713ece7e
354+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:69ae591831f0f96d31c85d360273c1ce436ae1dbbfa3d0b22a083cb228c9e82c
355355
- name: kind
356356
value: task
357357
resolver: bundles
@@ -376,7 +376,7 @@ spec:
376376
- name: name
377377
value: clamav-scan
378378
- name: bundle
379-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:37a2dcca17429a0e06f36a77c362d2f9b3cb4d0ad9c20393167bd740650a4657
379+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:5ac9b24cff7cfb391bc54cd5135536892090354862327d1028fa08872d759c03
380380
- name: kind
381381
value: task
382382
resolver: bundles

README.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ The following environment variables are configurable and may be set by the user
3434
| GIT_DEPLOY_TOKEN | Authentication token
3535
| GIT_DEPLOY_URL | The URL for the Git service (GitHub/GitLab are supported) to archive the sources
3636
| GIT_DISABLE_SSL_VERIFICATION | Whether to disable SSL verification for Git archival service communication
37-
| JBS_CONTAINER_BUILD | Use Konflux tasks to build using containers (default: `true`)
3837
| JBS_QUAY_IMAGE_CONTROLLER | The name for the operator image repository. Defaults to `hacbs-jvm-controller`.
3938
| JBS_QUAY_IMAGE_TAG | The tag for the images (defaults to `dev`)
4039
| JBS_QUAY_ORG | JBS images are pulled by default from the `QUAY_USERNAME` organization. This may be overridden by changing this

0 commit comments

Comments
 (0)