Skip to content

Commit 376882f

Browse files
openshift-pipelines-botopenshift-pipelines-bot
openshift-pipelines-bot
authored and
openshift-pipelines-bot
committed
[bot:release-v1.18.x] update konflux configuration
Generated by workflow [Generate konflux configurations](https://github.com/openshift-pipelines/hack/actions/runs/23526905161) Triggered by github-merge-queue[bot]
1 parent 1c27698 commit 376882f

8 files changed

Lines changed: 44 additions & 44 deletions

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
2525
pr_list=$(gh pr list \
2626
--state open \
27-
--base next \
27+
--base release-v1.18.x \
2828
--search 'label:upstream,label:hack -label:do-not-merge/hold' \
2929
--json number \
3030
--jq '.[]|.number')
3131
3232
success_pr_list=$(gh pr list \
3333
--state open \
34-
--base next \
34+
--base release-v1.18.x \
3535
--search 'label:upstream,label:hack -label:do-not-merge/hold' \
3636
--json number,title,statusCheckRollup \
3737
--jq ' .[]| select((.statusCheckRollup // [])| all(.conclusion == "SUCCESS" or .conclusion == "SKIPPED"))| "\(.number)"')

‎.github/workflows/update-sources.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch: {}
55
push:
66
branches:
7-
- next
7+
- release-v1.18.x
88
paths:
99
- .github/workflows/update-sources.yaml
1010
jobs:
@@ -17,7 +17,7 @@ jobs:
1717
- name: Checkout the current repo
1818
uses: actions/checkout@v4
1919
with:
20-
ref: next
20+
ref: release-v1.18.x
2121

2222
- name: Clone tektoncd/pruner
2323
run: |
@@ -33,7 +33,7 @@ jobs:
3333
3434
git config user.name openshift-pipelines-bot
3535
git config user.email pipelines-extcomm@redhat.com
36-
git checkout -b actions/update/sources-next
36+
git checkout -b actions/update/sources-release-v1.18.x
3737
touch head
3838
pushd upstream
3939
OLD_COMMIT=$(cat ../head)
@@ -54,22 +54,22 @@ jobs:
5454
fi
5555
5656
git commit -F- <<EOF
57-
[bot] Update next from tektoncd/pruner to ${NEW_COMMIT}
57+
[bot] Update release-v1.18.x from tektoncd/pruner to ${NEW_COMMIT}
5858
5959
$ git diff --stat ${NEW_COMMIT}..${OLD_COMMIT}
6060
$(cat /tmp/diff.txt | sed 's/^/ /' | head -c 55555)
6161
6262
https://github.com/tektoncd/pruner/compare/${NEW_COMMIT}..${OLD_COMMIT}
6363
EOF
6464
65-
git push -f origin actions/update/sources-next
65+
git push -f origin actions/update/sources-release-v1.18.x
6666
67-
if [ "$(gh pr list --base next --head actions/update/sources-next --json url --jq 'length')" = "0" ]; then
67+
if [ "$(gh pr list --base release-v1.18.x --head actions/update/sources-release-v1.18.x --json url --jq 'length')" = "0" ]; then
6868
echo "creating PR..."
69-
gh pr create -B next -H actions/update/sources-next --label=automated --label=upstream --fill
69+
gh pr create -B release-v1.18.x -H actions/update/sources-release-v1.18.x --label=automated --label=upstream --fill
7070
else
7171
echo "a PR already exists, editing..."
72-
gh pr edit --title "[bot] Update next from tektoncd/pruner to ${NEW_COMMIT}" --body "$(cat /tmp/diff.txt | sed 's/^/ /' | head -c 55555)"
72+
gh pr edit --title "[bot] Update release-v1.18.x from tektoncd/pruner to ${NEW_COMMIT}" --body "$(cat /tmp/diff.txt | sed 's/^/ /' | head -c 55555)"
7373
fi
7474
env:
7575
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.konflux/dockerfiles/controller.Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vend
1111
./cmd/controller
1212

1313
FROM $RUNTIME
14-
ARG VERSION=next
14+
ARG VERSION=1.18
1515

1616
ENV KO_APP=/ko-app \
1717
CONTROLLER=${KO_APP}/controller
@@ -20,15 +20,15 @@ COPY --from=builder /tmp/controller ${CONTROLLER}
2020

2121
LABEL \
2222
com.redhat.component="openshift-pipelines-pruner-controller-rhel9-container" \
23-
cpe="cpe:/a:redhat:openshift_pipelines:next::el9" \
23+
cpe="cpe:/a:redhat:openshift_pipelines:1.18::el9" \
2424
description="Red Hat OpenShift Pipelines tektoncd-pruner controller" \
2525
io.k8s.description="Red Hat OpenShift Pipelines tektoncd-pruner controller" \
2626
io.k8s.display-name="Red Hat OpenShift Pipelines tektoncd-pruner controller" \
2727
io.openshift.tags="tekton,openshift,tektoncd-pruner,controller" \
2828
maintainer="pipelines-extcomm@redhat.com" \
2929
name="openshift-pipelines/pipelines-pruner-controller-rhel9" \
3030
summary="Red Hat OpenShift Pipelines tektoncd-pruner controller" \
31-
version="next"
31+
version="v1.18.0"
3232

3333
RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot nonroot
3434
USER 65532

‎.konflux/dockerfiles/webhook.Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vend
1111
./cmd/webhook
1212

1313
FROM $RUNTIME
14-
ARG VERSION=next
14+
ARG VERSION=1.18
1515

1616
ENV KO_APP=/ko-app \
1717
WEBHOOK=${KO_APP}/webhook
@@ -20,15 +20,15 @@ COPY --from=builder /tmp/webhook ${WEBHOOK}
2020

2121
LABEL \
2222
com.redhat.component="openshift-pipelines-pruner-webhook-rhel9-container" \
23-
cpe="cpe:/a:redhat:openshift_pipelines:next::el9" \
23+
cpe="cpe:/a:redhat:openshift_pipelines:1.18::el9" \
2424
description="Red Hat OpenShift Pipelines tektoncd-pruner webhook" \
2525
io.k8s.description="Red Hat OpenShift Pipelines tektoncd-pruner webhook" \
2626
io.k8s.display-name="Red Hat OpenShift Pipelines tektoncd-pruner webhook" \
2727
io.openshift.tags="tekton,openshift,tektoncd-pruner,webhook" \
2828
maintainer="pipelines-extcomm@redhat.com" \
2929
name="openshift-pipelines/pipelines-pruner-webhook-rhel9" \
3030
summary="Red Hat OpenShift Pipelines tektoncd-pruner webhook" \
31-
version="next"
31+
version="v1.18.0"
3232

3333
RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot nonroot
3434
USER 65532

.tekton/tektoncd-pruner-next-controller-pull-request.yaml renamed to .tekton/tektoncd-pruner-1-18-controller-pull-request.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ metadata:
1111
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
1212
pipelinesascode.tekton.dev/max-keep-runs: "3"
1313
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
14-
== "next" &&
14+
== "release-v1.18.x" &&
1515
("upstream/***".pathChanged() || ".konflux/patches/***".pathChanged() || ".konflux/rpms/***".pathChanged() ||
1616
".konflux/dockerfiles/controller.Dockerfile".pathChanged() ||
17-
".tekton/tektoncd-pruner-next-controller-pull-request.yaml".pathChanged())
17+
".tekton/tektoncd-pruner-1-18-controller-pull-request.yaml".pathChanged())
1818
labels:
19-
appstudio.openshift.io/application: openshift-pipelines-core-next
20-
appstudio.openshift.io/component: tektoncd-pruner-next-controller
19+
appstudio.openshift.io/application: openshift-pipelines-core-1-18
20+
appstudio.openshift.io/component: tektoncd-pruner-1-18-controller
2121
pipelines.appstudio.openshift.io/type: build
22-
name: tektoncd-pruner-next-controller-on-pull-request
22+
name: tektoncd-pruner-1-18-controller-on-pull-request
2323
namespace: tekton-ecosystem-tenant
2424
spec:
2525
params:
@@ -37,7 +37,7 @@ spec:
3737
value: .konflux/dockerfiles/controller.Dockerfile
3838
- name: additional-tags
3939
value:
40-
- "on-pr-next"
40+
- "on-pr-v1.18.0"
4141
- name: build-platforms
4242
value:
4343
- linux/x86_64
@@ -47,7 +47,7 @@ spec:
4747
pipelineRef:
4848
name: docker-build-ta
4949
taskRunTemplate:
50-
serviceAccountName: build-pipeline-tektoncd-pruner-next-controller
50+
serviceAccountName: build-pipeline-tektoncd-pruner-1-18-controller
5151
workspaces:
5252
- name: git-auth
5353
secret:

.tekton/tektoncd-pruner-next-controller-push.yaml renamed to .tekton/tektoncd-pruner-1-18-controller-push.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ metadata:
1010
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
1111
pipelinesascode.tekton.dev/max-keep-runs: "3"
1212
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
13-
== "next" &&
13+
== "release-v1.18.x" &&
1414
("upstream/***".pathChanged() || ".konflux/patches/***".pathChanged() || ".konflux/rpms/***".pathChanged() ||
1515
".konflux/dockerfiles/controller.Dockerfile".pathChanged() ||
16-
".tekton/tektoncd-pruner-next-controller-push.yaml".pathChanged())
16+
".tekton/tektoncd-pruner-1-18-controller-push.yaml".pathChanged())
1717
creationTimestamp: null
1818
labels:
19-
appstudio.openshift.io/application: openshift-pipelines-core-next
20-
appstudio.openshift.io/component: tektoncd-pruner-next-controller
19+
appstudio.openshift.io/application: openshift-pipelines-core-1-18
20+
appstudio.openshift.io/component: tektoncd-pruner-1-18-controller
2121
pipelines.appstudio.openshift.io/type: build
22-
name: tektoncd-pruner-next-controller-on-push
22+
name: tektoncd-pruner-1-18-controller-on-push
2323
namespace: tekton-ecosystem-tenant
2424
spec:
2525
params:
@@ -35,14 +35,14 @@ spec:
3535
value: .konflux/dockerfiles/controller.Dockerfile
3636
- name: additional-tags
3737
value:
38-
- "next"
38+
- "v1.18.0"
3939
- name: prefetch-input
4040
value: |
4141
{"type": "rpm", "path": ".konflux/rpms"}
4242
pipelineRef:
4343
name: docker-build-ta
4444
taskRunTemplate:
45-
serviceAccountName: build-pipeline-tektoncd-pruner-next-controller
45+
serviceAccountName: build-pipeline-tektoncd-pruner-1-18-controller
4646
workspaces:
4747
- name: git-auth
4848
secret:

.tekton/tektoncd-pruner-next-webhook-pull-request.yaml renamed to .tekton/tektoncd-pruner-1-18-webhook-pull-request.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ metadata:
1111
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
1212
pipelinesascode.tekton.dev/max-keep-runs: "3"
1313
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
14-
== "next" &&
14+
== "release-v1.18.x" &&
1515
("upstream/***".pathChanged() || ".konflux/patches/***".pathChanged() || ".konflux/rpms/***".pathChanged() ||
1616
".konflux/dockerfiles/webhook.Dockerfile".pathChanged() ||
17-
".tekton/tektoncd-pruner-next-webhook-pull-request.yaml".pathChanged())
17+
".tekton/tektoncd-pruner-1-18-webhook-pull-request.yaml".pathChanged())
1818
labels:
19-
appstudio.openshift.io/application: openshift-pipelines-core-next
20-
appstudio.openshift.io/component: tektoncd-pruner-next-webhook
19+
appstudio.openshift.io/application: openshift-pipelines-core-1-18
20+
appstudio.openshift.io/component: tektoncd-pruner-1-18-webhook
2121
pipelines.appstudio.openshift.io/type: build
22-
name: tektoncd-pruner-next-webhook-on-pull-request
22+
name: tektoncd-pruner-1-18-webhook-on-pull-request
2323
namespace: tekton-ecosystem-tenant
2424
spec:
2525
params:
@@ -37,7 +37,7 @@ spec:
3737
value: .konflux/dockerfiles/webhook.Dockerfile
3838
- name: additional-tags
3939
value:
40-
- "on-pr-next"
40+
- "on-pr-v1.18.0"
4141
- name: build-platforms
4242
value:
4343
- linux/x86_64
@@ -47,7 +47,7 @@ spec:
4747
pipelineRef:
4848
name: docker-build-ta
4949
taskRunTemplate:
50-
serviceAccountName: build-pipeline-tektoncd-pruner-next-webhook
50+
serviceAccountName: build-pipeline-tektoncd-pruner-1-18-webhook
5151
workspaces:
5252
- name: git-auth
5353
secret:

.tekton/tektoncd-pruner-next-webhook-push.yaml renamed to .tekton/tektoncd-pruner-1-18-webhook-push.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ metadata:
1010
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
1111
pipelinesascode.tekton.dev/max-keep-runs: "3"
1212
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
13-
== "next" &&
13+
== "release-v1.18.x" &&
1414
("upstream/***".pathChanged() || ".konflux/patches/***".pathChanged() || ".konflux/rpms/***".pathChanged() ||
1515
".konflux/dockerfiles/webhook.Dockerfile".pathChanged() ||
16-
".tekton/tektoncd-pruner-next-webhook-push.yaml".pathChanged())
16+
".tekton/tektoncd-pruner-1-18-webhook-push.yaml".pathChanged())
1717
creationTimestamp: null
1818
labels:
19-
appstudio.openshift.io/application: openshift-pipelines-core-next
20-
appstudio.openshift.io/component: tektoncd-pruner-next-webhook
19+
appstudio.openshift.io/application: openshift-pipelines-core-1-18
20+
appstudio.openshift.io/component: tektoncd-pruner-1-18-webhook
2121
pipelines.appstudio.openshift.io/type: build
22-
name: tektoncd-pruner-next-webhook-on-push
22+
name: tektoncd-pruner-1-18-webhook-on-push
2323
namespace: tekton-ecosystem-tenant
2424
spec:
2525
params:
@@ -35,14 +35,14 @@ spec:
3535
value: .konflux/dockerfiles/webhook.Dockerfile
3636
- name: additional-tags
3737
value:
38-
- "next"
38+
- "v1.18.0"
3939
- name: prefetch-input
4040
value: |
4141
{"type": "rpm", "path": ".konflux/rpms"}
4242
pipelineRef:
4343
name: docker-build-ta
4444
taskRunTemplate:
45-
serviceAccountName: build-pipeline-tektoncd-pruner-next-webhook
45+
serviceAccountName: build-pipeline-tektoncd-pruner-1-18-webhook
4646
workspaces:
4747
- name: git-auth
4848
secret:

0 commit comments

Comments
 (0)