Skip to content

Commit d2fec11

Browse files
openshift-pipelines-botpramodbindal
authored andcommitted
[bot:next] update konflux configuration
Generated by workflow [Generate konflux configurations](https://github.com/openshift-pipelines/hack/actions/runs/22666660782) Triggered by github-merge-queue[bot]
1 parent f304a2e commit d2fec11

File tree

3 files changed

+30
-15
lines changed

3 files changed

+30
-15
lines changed

.github/workflows/auto-merge-upstream.yaml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66

77
jobs:
88
auto-approve-and-merge:
9+
# This line prevents the job from running if CodeFreeze is true
10+
if: true
911
runs-on: ubuntu-latest
1012
permissions:
1113
pull-requests: write
@@ -19,35 +21,43 @@ jobs:
1921
gh auth status
2022
git config user.name openshift-pipelines-bot
2123
git config user.email pipelines-extcomm@redhat.com
22-
# Approve and merge pull-request with no reviews
2324
2425
pr_list=$(gh pr list \
2526
--state open \
26-
--search 'label:upstream -label:do-not-merge/hold' \
27+
--base next \
28+
--search 'label:upstream,label:hack -label:do-not-merge/hold' \
29+
--json number \
30+
--jq '.[]|.number')
31+
32+
success_pr_list=$(gh pr list \
33+
--state open \
34+
--base next \
35+
--search 'label:upstream,label:hack -label:do-not-merge/hold' \
2736
--json number,title,statusCheckRollup \
2837
--jq ' .[]| select((.statusCheckRollup // [])| all(.conclusion == "SUCCESS" or .conclusion == "SKIPPED"))| "\(.number)"')
2938
3039
echo "pr_list=$pr_list" >> "$GITHUB_OUTPUT"
40+
echo "success_pr_list=$success_pr_list" >> "$GITHUB_OUTPUT"
3141
env:
3242
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3343

34-
- name: add LGTM Label
44+
- name: Approve and add LGTM Label
3545
run: |
3646
# Approve and merge pull-request with no reviews
3747
for p in $pr_list; do
3848
echo "Adding lgtm label to PR $p"
39-
gh pr edit $p --add-label "lgtm" || true
49+
gh pr edit $p --add-label "lgtm" --add-label "approved" || true
4050
done
4151
env:
4252
pr_list: ${{ steps.list-prs.outputs.pr_list }}
4353
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4454
- name: Merging PRs
4555
run: |
4656
# Approve and merge pull-request with no reviews
47-
for p in $pr_list; do
57+
for p in $success_pr_list; do
4858
echo "Merging PR $p"
4959
gh pr merge --rebase --delete-branch --auto $p
5060
done
5161
env:
52-
pr_list: ${{ steps.list-prs.outputs.pr_list }}
62+
success_pr_list: ${{ steps.list-prs.outputs.success_pr_list }}
5363
GH_TOKEN: ${{ secrets.OPENSHIFT_PIPELINES_ROBOT }}

.github/workflows/update-sources.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
name: update-sources
33
on:
44
workflow_dispatch: {}
5-
5+
push:
6+
branches:
7+
- next
8+
paths:
9+
- .github/workflows/update-sources.yaml
610
jobs:
711
update-sources:
812
runs-on: ubuntu-latest

.konflux/dockerfiles/controller.Dockerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@ COPY --from=builder /tmp/controller /ko-app/controller
2424
COPY head ${KO_DATA_PATH}/HEAD
2525

2626
LABEL \
27-
com.redhat.component="openshift-pipelines-chains-controller-rhel8-container" \
28-
name="openshift-pipelines/pipelines-chains-controller-rhel8" \
29-
version=$VERSION \
30-
summary="Red Hat OpenShift Pipelines Chains Controller" \
27+
com.redhat.component="openshift-pipelines-chains-controller-rhel9-container" \
28+
cpe="cpe:/a:redhat:openshift_pipelines:next::el9" \
29+
description="Red Hat OpenShift Pipelines tektoncd-chains controller" \
30+
io.k8s.description="Red Hat OpenShift Pipelines tektoncd-chains controller" \
31+
io.k8s.display-name="Red Hat OpenShift Pipelines tektoncd-chains controller" \
32+
io.openshift.tags="tekton,openshift,tektoncd-chains,controller" \
3133
maintainer="pipelines-extcomm@redhat.com" \
32-
description="Red Hat OpenShift Pipelines Chains Controller" \
33-
io.k8s.display-name="Red Hat OpenShift Pipelines Chains Controller" \
34-
io.k8s.description="Red Hat OpenShift Pipelines Chains Controller" \
35-
io.openshift.tags="pipelines,tekton,openshift"
34+
name="openshift-pipelines/pipelines-chains-controller-rhel9" \
35+
summary="Red Hat OpenShift Pipelines tektoncd-chains controller" \
36+
version="next"
3637

3738
RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot nonroot
3839
USER 65532

0 commit comments

Comments
 (0)