Skip to content

Commit 117cac3

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Discover new branches and update pipelines
1 parent 3093093 commit 117cac3

File tree

11 files changed

+276
-76
lines changed

11 files changed

+276
-76
lines changed

‎.github/workflows/release-generate-ci.yaml‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -765,6 +765,54 @@ jobs:
765765
fi
766766
gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true
767767
working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/client
768+
- env:
769+
GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
770+
GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
771+
if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }}
772+
name: '[client - release-v1.20] Create Konflux PR'
773+
run: |
774+
set -x
775+
repo="client"
776+
branch="sync-konflux-release-v1.20"
777+
target_branch="release-v1.20"
778+
git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors
779+
remote_exists=$(git ls-remote --heads fork "$branch")
780+
if [ -z "$remote_exists" ]; then
781+
# remote doesn't exist.
782+
git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1
783+
fi
784+
git fetch fork "$branch"
785+
if git diff --quiet "fork/$branch" "$branch"; then
786+
echo "Branches are identical. No need to force push."
787+
else
788+
git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f
789+
fi
790+
gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update Konflux configurations" --body "Update Konflux components and pipelines" || true
791+
working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/client
792+
- env:
793+
GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
794+
GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
795+
if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }}
796+
name: '[client - release-v1.20] Create OWNERS file update PR'
797+
run: |
798+
set -x
799+
repo="client"
800+
branch="sync-owners-release-v1.20"
801+
target_branch="release-v1.20"
802+
git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors
803+
remote_exists=$(git ls-remote --heads fork "$branch")
804+
if [ -z "$remote_exists" ]; then
805+
# remote doesn't exist.
806+
git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1
807+
fi
808+
git fetch fork "$branch"
809+
if git diff --quiet "fork/$branch" "$branch"; then
810+
echo "Branches are identical. No need to force push."
811+
else
812+
git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f
813+
fi
814+
gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true
815+
working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/client
768816
- env:
769817
GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
770818
GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
@@ -1029,6 +1077,54 @@ jobs:
10291077
fi
10301078
gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true
10311079
working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing-integrations
1080+
- env:
1081+
GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
1082+
GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
1083+
if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }}
1084+
name: '[eventing-integrations - release-v1.20] Create Konflux PR'
1085+
run: |
1086+
set -x
1087+
repo="eventing-integrations"
1088+
branch="sync-konflux-release-v1.20"
1089+
target_branch="release-v1.20"
1090+
git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors
1091+
remote_exists=$(git ls-remote --heads fork "$branch")
1092+
if [ -z "$remote_exists" ]; then
1093+
# remote doesn't exist.
1094+
git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1
1095+
fi
1096+
git fetch fork "$branch"
1097+
if git diff --quiet "fork/$branch" "$branch"; then
1098+
echo "Branches are identical. No need to force push."
1099+
else
1100+
git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f
1101+
fi
1102+
gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update Konflux configurations" --body "Update Konflux components and pipelines" || true
1103+
working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing-integrations
1104+
- env:
1105+
GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
1106+
GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
1107+
if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }}
1108+
name: '[eventing-integrations - release-v1.20] Create OWNERS file update PR'
1109+
run: |
1110+
set -x
1111+
repo="eventing-integrations"
1112+
branch="sync-owners-release-v1.20"
1113+
target_branch="release-v1.20"
1114+
git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors
1115+
remote_exists=$(git ls-remote --heads fork "$branch")
1116+
if [ -z "$remote_exists" ]; then
1117+
# remote doesn't exist.
1118+
git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1
1119+
fi
1120+
git fetch fork "$branch"
1121+
if git diff --quiet "fork/$branch" "$branch"; then
1122+
echo "Branches are identical. No need to force push."
1123+
else
1124+
git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f
1125+
fi
1126+
gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true
1127+
working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing-integrations
10321128
- env:
10331129
GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
10341130
GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
@@ -1893,6 +1989,54 @@ jobs:
18931989
fi
18941990
gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true
18951991
working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing
1992+
- env:
1993+
GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
1994+
GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
1995+
if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }}
1996+
name: '[eventing - release-v1.20] Create Konflux PR'
1997+
run: |
1998+
set -x
1999+
repo="eventing"
2000+
branch="sync-konflux-release-v1.20"
2001+
target_branch="release-v1.20"
2002+
git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors
2003+
remote_exists=$(git ls-remote --heads fork "$branch")
2004+
if [ -z "$remote_exists" ]; then
2005+
# remote doesn't exist.
2006+
git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1
2007+
fi
2008+
git fetch fork "$branch"
2009+
if git diff --quiet "fork/$branch" "$branch"; then
2010+
echo "Branches are identical. No need to force push."
2011+
else
2012+
git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f
2013+
fi
2014+
gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update Konflux configurations" --body "Update Konflux components and pipelines" || true
2015+
working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing
2016+
- env:
2017+
GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
2018+
GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
2019+
if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }}
2020+
name: '[eventing - release-v1.20] Create OWNERS file update PR'
2021+
run: |
2022+
set -x
2023+
repo="eventing"
2024+
branch="sync-owners-release-v1.20"
2025+
target_branch="release-v1.20"
2026+
git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors
2027+
remote_exists=$(git ls-remote --heads fork "$branch")
2028+
if [ -z "$remote_exists" ]; then
2029+
# remote doesn't exist.
2030+
git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1
2031+
fi
2032+
git fetch fork "$branch"
2033+
if git diff --quiet "fork/$branch" "$branch"; then
2034+
echo "Branches are identical. No need to force push."
2035+
else
2036+
git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f
2037+
fi
2038+
gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true
2039+
working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing
18962040
- env:
18972041
GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}
18982042
GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }}

‎config/client.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,21 @@ config:
7171
useClusterPool: true
7272
version: "4.19"
7373
promotion: {}
74+
release-v1.20:
75+
konflux:
76+
enabled: true
77+
imageOverrides:
78+
- name: CLI_ARTIFACTS
79+
pullSpec: brew.registry.redhat.io/rh-osbs/openshift-serverless-1-kn-cli-artifacts-rhel8:1.16.0
80+
openShiftVersions:
81+
- candidateRelease: true
82+
onDemand: true
83+
skipCron: true
84+
version: "4.20"
85+
- skipCron: true
86+
useClusterPool: true
87+
version: "4.19"
88+
promotion: {}
7489
repositories:
7590
- canonicalGoRepository: github.com/knative/client
7691
dockerfiles: {}

‎config/eventing-integrations.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,30 @@ config:
119119
promotion: {}
120120
skipDockerFilesMatches:
121121
- .*hermetic.*
122+
release-v1.20:
123+
konflux:
124+
enabled: true
125+
javaImages:
126+
- .*eventing-integrations-aws-ddb-streams-source
127+
- .*eventing-integrations-aws-s3-sink
128+
- .*eventing-integrations-aws-s3-source
129+
- .*eventing-integrations-aws-sns-sink
130+
- .*eventing-integrations-aws-sqs-sink
131+
- .*eventing-integrations-aws-sqs-source
132+
- .*eventing-integrations-log-sink
133+
- .*eventing-integrations-timer-source
134+
openShiftVersions:
135+
- candidateRelease: true
136+
onDemand: true
137+
skipCron: true
138+
version: "4.20"
139+
- useClusterPool: true
140+
version: "4.19"
141+
- onDemand: true
142+
version: "4.14"
143+
promotion: {}
144+
skipDockerFilesMatches:
145+
- .*hermetic.*
122146
repositories:
123147
- dockerfiles: {}
124148
e2e:

‎config/eventing.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,19 @@ config:
7272
- onDemand: true
7373
version: "4.14"
7474
promotion: {}
75+
release-v1.20:
76+
konflux:
77+
enabled: true
78+
openShiftVersions:
79+
- candidateRelease: true
80+
onDemand: true
81+
skipCron: true
82+
version: "4.20"
83+
- useClusterPool: true
84+
version: "4.19"
85+
- onDemand: true
86+
version: "4.14"
87+
promotion: {}
7588
repositories:
7689
- dockerfiles: {}
7790
e2e:

‎config/serverless-operator.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ config:
120120
onDemand: true
121121
skipCron: true
122122
version: "4.20"
123-
- useClusterPool: true
124-
skipCron: true
123+
- skipCron: true
124+
useClusterPool: true
125125
version: "4.19"
126126
- onDemand: true
127127
skipCron: true
@@ -579,6 +579,10 @@ repositories:
579579
memory: 200Mi
580580
workflow: firewatch-ipi-aws-cr
581581
timeout: 8h0m0s
582+
zz_generated_metadata:
583+
branch: ""
584+
org: ""
585+
repo: ""
582586
dockerfiles:
583587
matches:
584588
- knative-operator/.*

‎pkg/konfluxgen/bundle-build.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ spec:
158158
- name: name
159159
value: buildah-remote-oci-ta
160160
- name: bundle
161-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.6@sha256:ac05dabe8b6b446f974cf2b6ef1079cfaa9443d7078c2ebe3ec79aa650e1b5b2
161+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.6@sha256:ada9b66ac76993bb11a85b8654a534401bccd2a3a4135fa466779e2d77468a41
162162
- name: kind
163163
value: task
164164
resolver: bundles
@@ -186,7 +186,7 @@ spec:
186186
- name: name
187187
value: sast-snyk-check-oci-ta
188188
- name: bundle
189-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
189+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:60f2dac41844d222086ff7f477e51f3563716b183d87db89f603d6f604c21760
190190
- name: kind
191191
value: task
192192
resolver: bundles
@@ -214,7 +214,7 @@ spec:
214214
- name: name
215215
value: prefetch-dependencies-oci-ta
216216
- name: bundle
217-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:970285e3b0495961199523b566e0dd92ec2e29bedbcf61d8fc67106b06d0f923
217+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:0503f9313dfe70e4defda88a7226ec91a74af42198dccfa3280397d965aa16d6
218218
- name: kind
219219
value: task
220220
resolver: bundles
@@ -255,7 +255,7 @@ spec:
255255
- name: name
256256
value: init
257257
- name: bundle
258-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
258+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:3ca52e1d8885fc229bd9067275f44d5b21a9a609981d0324b525ddeca909bf10
259259
- name: kind
260260
value: task
261261
resolver: bundles
@@ -276,7 +276,7 @@ spec:
276276
- name: name
277277
value: git-clone-oci-ta
278278
- name: bundle
279-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3a920a83fc0135aaae2730fe9d446eb2da2ffc9d63a34bceea04afd24653bdee
279+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3dc39eae48745a96097c07c577b944d6203a91c35d3f71d9ed5feab41d327a6a
280280
- name: kind
281281
value: task
282282
resolver: bundles
@@ -310,7 +310,7 @@ spec:
310310
- name: name
311311
value: build-image-index
312312
- name: bundle
313-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
313+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:5da3230a9ecfc5aa58f3e2224327d38d7b4556bda98ea77c6e7b0e80ac1353ad
314314
- name: kind
315315
value: task
316316
resolver: bundles
@@ -336,7 +336,7 @@ spec:
336336
- name: name
337337
value: source-build-oci-ta
338338
- name: bundle
339-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:2a290f91fdccf4c9ef726a1605163bc14904e1dbf9837ac6d2621caddd10f98e
339+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:282cb5a9119a87e88559444feff67d76d6f356d03654b4845632c049b2314735
340340
- name: kind
341341
value: task
342342
resolver: bundles
@@ -389,7 +389,7 @@ spec:
389389
- name: name
390390
value: clair-scan
391391
- name: bundle
392-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
392+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8ec7d7b9438ace5ef3fb03a533d9440d0fd81e51c73b0dc1eb51602fb7cd044e
393393
- name: kind
394394
value: task
395395
resolver: bundles
@@ -416,7 +416,7 @@ spec:
416416
- name: name
417417
value: clamav-scan
418418
- name: bundle
419-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
419+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:f3d2d179cddcc07d0228d9f52959a233037a3afa2619d0a8b2effbb467db80c3
420420
- name: kind
421421
value: task
422422
resolver: bundles
@@ -442,7 +442,7 @@ spec:
442442
- name: name
443443
value: sast-shell-check-oci-ta
444444
- name: bundle
445-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:bf7bdde00b7212f730c1356672290af6f38d070da2c8a316987b5c32fd49e0b9
445+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:1f0fcba24ebc447d9f8a2ea2e8f262fa435d6c523ca6b0346cd67261551fc9ed
446446
- name: kind
447447
value: task
448448
resolver: bundles
@@ -468,7 +468,7 @@ spec:
468468
- name: name
469469
value: sast-unicode-check-oci-ta
470470
- name: bundle
471-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:a2bde66f6b4164620298c7d709b8f08515409404000fa1dc2260d2508b135651
471+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:1833c618170ab9deb8455667f220df8e88d16ccd630a2361366f594e2bdcb712
472472
- name: kind
473473
value: task
474474
resolver: bundles
@@ -496,7 +496,7 @@ spec:
496496
- name: name
497497
value: push-dockerfile-oci-ta
498498
- name: bundle
499-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:14fba04580b236e4206a904b86ee2fd8eeaa4163f7619a9c2602d361e4f74c51
499+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:13633d5ba8445c0f732a0a5d1b33ffbb708398e45ef1647542b0ab22fee25a6a
500500
- name: kind
501501
value: task
502502
resolver: bundles
@@ -513,7 +513,7 @@ spec:
513513
- name: name
514514
value: rpms-signature-scan
515515
- name: bundle
516-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:06977232e67509e5540528ff6c3b081b23fc5bf3e40fb3e2d09a086d5c3243fc
516+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:3d016c63bcab64ab82da762a52b013c0bcb534e9523b8c0e073cc3a0c02f0cac
517517
- name: kind
518518
value: task
519519
resolver: bundles

0 commit comments

Comments
 (0)