Skip to content

Commit a0d94ed

Browse files
author
openshift-pipelines-bot
committed
Update automerge workflow for nudges and add index catalogs
1 parent f96e7c7 commit a0d94ed

File tree

17 files changed

+57941
-49
lines changed

17 files changed

+57941
-49
lines changed

.github/workflows/auto-approve-konflux-nudges.yaml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: auto-approve-konflux-nudges
33
on:
44
workflow_dispatch: {}
55
schedule:
6-
- cron: "*/30 * * * *" # At every 30 minutes
6+
- cron: "0,30 * * * *" # At every 30 minutes
77

88
jobs:
99
auto-approve:
@@ -14,18 +14,15 @@ jobs:
1414
steps:
1515
- name: Checkout the current repo
1616
uses: actions/checkout@v4
17-
- name: auto-approve
17+
- name: auto-merge-update-references
1818
run: |
1919
gh auth status
2020
git config user.name openshift-pipelines-bot
2121
git config user.email [email protected]
2222
# Approve and merge pull-request with no reviews
23-
for p in $(gh pr list --search "author:app/red-hat-konflux chore(deps) .*" --json "title,labels,number" | jq ".[] | select((.labels | length) == 0) | .number"); do
24-
gh pr review $p --approve --body "/lgtm"
25-
done
26-
# LGTM pull requests that might have one review but no more lgtm
27-
for p in $(gh pr list --search "author:app/red-hat-konflux chore(deps) .*" --json "title,labels,number" | jq ".[] | select((.labels | length) == 1) | .number"); do
28-
gh pr review $p --approve --body "/lgtm"
23+
for p in $(gh pr list --search "label:konflux-nudge" --json "number" | jq ".[].number"); do
24+
gh pr review --approve --body "/lgtm" $p
25+
gh pr merge --rebase --delete-branch --auto $p
2926
done
3027
env:
31-
GH_TOKEN: ${{ secrets.OPENSHIFT_PIPELINES_ROBOT }}
28+
GH_TOKEN: ${{ secrets.OPENSHIFT_PIPELINES_ROBOT }}

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

Lines changed: 0 additions & 40 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
FROM registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.17
2+
3+
ENTRYPOINT ["/bin/opm"]
4+
CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
5+
6+
COPY .konflux/olm-catalog/index/v4.17/catalog/ /configs
7+
RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"]
8+
9+
# Core bundle labels.
10+
11+
LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
12+
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
13+
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
14+
LABEL operators.operatorframework.io.bundle.package.v1=openshift-pipelines-operator-rh
15+
LABEL operators.operatorframework.io.bundle.channel.default.v1="pipelines-main"
16+
LABEL operators.operatorframework.io.bundle.channels.v1="pipelines-main"
17+
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.37.0
18+
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
19+
LABEL operators.operatorframework.io.index.configs.v1=/configs

.konflux/olm-catalog/index/v4.12/catalog-template.json

Lines changed: 248 additions & 0 deletions
Large diffs are not rendered by default.

.konflux/olm-catalog/index/v4.12/catalog/openshift-pipelines-operator-rh/catalog.json

Lines changed: 11320 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
FROM registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.17
2+
3+
ENTRYPOINT ["/bin/opm"]
4+
CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
5+
6+
COPY .konflux/olm-catalog/index/v4.17/catalog/ /configs
7+
RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"]
8+
9+
# Core bundle labels.
10+
11+
LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
12+
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
13+
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
14+
LABEL operators.operatorframework.io.bundle.package.v1=openshift-pipelines-operator-rh
15+
LABEL operators.operatorframework.io.bundle.channel.default.v1="pipelines-main"
16+
LABEL operators.operatorframework.io.bundle.channels.v1="pipelines-main"
17+
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.37.0
18+
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
19+
LABEL operators.operatorframework.io.index.configs.v1=/configs

0 commit comments

Comments
 (0)