Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ operator:
with: pipeline:cluster-group-upgrades-operator
promotion:
to:
- name: "4.22"
- name: "5.0"
namespace: ocp-kni
releases:
initial:
integration:
name: "4.22"
name: "5.0"
namespace: ocp
reference_policy: Local
latest:
integration:
include_built_images: true
name: "4.22"
name: "5.0"
namespace: ocp
reference_policy: Local
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ tests:
OO_TARGET_NAMESPACES: '!all'
USER_TAGS: |
ci-job-source prowci
ci-job-branch main
ci-job-branch release-4.15
ci-job-fullname openshift-kni-cluster-group-upgrades-operator-main
ci-job-type optional-operators-ci-aws
ci-repo-name cluster-group-upgrades-operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ tests:
OO_TARGET_NAMESPACES: '!all'
USER_TAGS: |
ci-job-source prowci
ci-job-branch main
ci-job-branch release-4.16
ci-job-fullname openshift-kni-cluster-group-upgrades-operator-main
ci-job-type optional-operators-ci-aws
ci-repo-name cluster-group-upgrades-operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ tests:
OO_TARGET_NAMESPACES: '!all'
USER_TAGS: |
ci-job-source prowci
ci-job-branch main
ci-job-branch release-4.17
ci-job-fullname openshift-kni-cluster-group-upgrades-operator-main
ci-job-type optional-operators-ci-aws
ci-repo-name cluster-group-upgrades-operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ tests:
OO_TARGET_NAMESPACES: '!all'
USER_TAGS: |
ci-job-source prowci
ci-job-branch main
ci-job-branch release-4.18
ci-job-fullname openshift-kni-cluster-group-upgrades-operator-main
ci-job-type optional-operators-ci-aws
ci-repo-name cluster-group-upgrades-operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ tests:
OO_TARGET_NAMESPACES: '!all'
USER_TAGS: |
ci-job-source prowci
ci-job-branch main
ci-job-branch release-4.19
ci-job-fullname openshift-kni-cluster-group-upgrades-operator-main
ci-job-type optional-operators-ci-aws
ci-repo-name cluster-group-upgrades-operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ tests:
OO_TARGET_NAMESPACES: '!all'
USER_TAGS: |
ci-job-source prowci
ci-job-branch main
ci-job-branch release-4.20
ci-job-fullname openshift-kni-cluster-group-upgrades-operator-main
ci-job-type optional-operators-ci-aws
ci-repo-name cluster-group-upgrades-operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ tests:
OO_TARGET_NAMESPACES: '!all'
USER_TAGS: |
ci-job-source prowci
ci-job-branch main
ci-job-branch release-4.21
ci-job-fullname openshift-kni-cluster-group-upgrades-operator-main
ci-job-type optional-operators-ci-aws
ci-repo-name cluster-group-upgrades-operator
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
base_images:
base:
name: ubi-minimal
namespace: ocp
tag: "9"
build_root:
from_repository: true
images:
items:
- build_args:
- name: COVER
value: "true"
dockerfile_path: Dockerfile
from: base
to: cluster-group-upgrades-operator
- dockerfile_path: Dockerfile.precache
from: base
to: cluster-group-upgrades-operator-precache
- dockerfile_path: Dockerfile.recovery
from: base
to: cluster-group-upgrades-operator-recovery
- dockerfile_path: bundle.Dockerfile
to: cluster-group-upgrades-operator-bundle
operator:
bundles:
- dockerfile_path: bundle.Dockerfile
substitutions:
- pullspec: quay.io/openshift-kni/cluster-group-upgrades-operator:.*
with: pipeline:cluster-group-upgrades-operator
promotion:
to:
- name: "4.22"
namespace: ocp-kni
releases:
initial:
integration:
name: "4.22"
namespace: ocp
reference_policy: Local
latest:
integration:
include_built_images: true
name: "4.22"
namespace: ocp
reference_policy: Local
resources:
'*':
limits:
memory: 4Gi
requests:
cpu: 100m
memory: 200Mi
tests:
- as: ci-job
commands: |
unset VERSION
export XDG_CACHE_HOME=/tmp/.cache
export XDG_CONFIG_HOME=/tmp/.config
export XDG_DATA_HOME=/tmp/.local/share
make ci-job
make coveralls-download
export COVERALLS_REPO_TOKEN=$(cat /etc/coveralls/TOKEN)
./bin/coveralls report --job-flag "unit-tests" --build-number=$(git rev-parse HEAD) coverage.out
container:
from: src
secrets:
- mount_path: /etc/coveralls
name: cluster-group-upgrades-operator-coverall
skip_if_only_changed: ^(?:.*/)?(?:\.gitignore|\.tekton/.*|\.konflux/.*|.*\.md|OWNERS|OWNERS_ALIASES|LICENSE)$
- as: integration
skip_if_only_changed: ^(?:.*/)?(?:\.gitignore|\.tekton/.*|\.konflux/.*|.*\.md|OWNERS|OWNERS_ALIASES|LICENSE)$
steps:
cluster_profile: aws-telco
env:
BASE_DOMAIN: telco5g-ci.devcluster.openshift.com
OO_CHANNEL: alpha
OO_INSTALL_NAMESPACE: openshift-cluster-group-upgrades
OO_PACKAGE: cluster-group-upgrades-operator
OO_TARGET_NAMESPACES: '!all'
USER_TAGS: |
ci-job-source prowci
ci-job-branch release-4.22
ci-job-fullname openshift-kni-cluster-group-upgrades-operator-main
Comment on lines +80 to +83
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Update the release job tags to release-4.22.

This new release config still tags integration resources as main, which will misattribute AWS resources and job metadata for release-4.22 runs.

🏷️ Proposed fix
       USER_TAGS: |
         ci-job-source prowci
-        ci-job-branch main
-        ci-job-fullname openshift-kni-cluster-group-upgrades-operator-main
+        ci-job-branch release-4.22
+        ci-job-fullname openshift-kni-cluster-group-upgrades-operator-release-4.22
         ci-job-type optional-operators-ci-aws
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
USER_TAGS: |
ci-job-source prowci
ci-job-branch main
ci-job-fullname openshift-kni-cluster-group-upgrades-operator-main
USER_TAGS: |
ci-job-source prowci
ci-job-branch release-4.22
ci-job-fullname openshift-kni-cluster-group-upgrades-operator-release-4.22
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In
`@ci-operator/config/openshift-kni/cluster-group-upgrades-operator/openshift-kni-cluster-group-upgrades-operator-release-4.22.yaml`
around lines 80 - 83, Update the USER_TAGS block so the release-specific tag
values reflect release-4.22: change the ci-job-branch value from "main" to
"release-4.22" and update ci-job-fullname from
"openshift-kni-cluster-group-upgrades-operator-main" to
"openshift-kni-cluster-group-upgrades-operator-release-4.22" (leave
ci-job-source as-is); modify the USER_TAGS entries (ci-job-branch and
ci-job-fullname) in the YAML to ensure AWS resources and job metadata are
attributed to release-4.22.

ci-job-type optional-operators-ci-aws
ci-repo-name cluster-group-upgrades-operator
ci-org-name openshift-kni
pre:
- chain: ipi-aws-pre
- as: pre
cli: latest
commands: |
KUBECONFIG="${SHARED_DIR}/kubeconfig"
export KUBECONFIG
cp $(echo "${KUBECONFIG}") /go/src/github.com/openshift-kni/cluster-group-upgrades-operator/kubeconfig
make non-kind-deps-update
make install-acm-crds
from: src
resources:
requests:
cpu: 100m
memory: 200Mi
- ref: optional-operators-subscribe
test:
- as: integration
cli: latest
commands: |
KUBECONFIG="${SHARED_DIR}/kubeconfig"
export KUBECONFIG
cp $(echo "${KUBECONFIG}") /go/src/github.com/openshift-kni/cluster-group-upgrades-operator/kubeconfig
./hack/add-sidecar-csv.sh
sleep 60
make complete-kuttl-test
./hack/extract-coverage.sh
sed -i 's/\/workspace/\./g' ./runtime-coverage/coverage.out
make coveralls-download
export COVERALLS_REPO_TOKEN=$(cat /etc/coveralls/TOKEN)
./bin/coveralls report --job-flag "integration-tests" --build-number=$(git rev-parse HEAD) ./runtime-coverage/coverage.out
credentials:
- mount_path: /etc/coveralls
name: cluster-group-upgrades-operator-coverall
namespace: test-credentials
from: src
resources:
requests:
cpu: 100m
memory: 200Mi
workflow: optional-operators-ci-aws
- as: tekton-linting
commands: |
unset VERSION
export XDG_CACHE_HOME=/tmp/.cache
export XDG_CONFIG_HOME=/tmp/.config
export XDG_DATA_HOME=/tmp/.local/share
make yamllint
container:
from: src
optional: true
run_if_changed: ^(?:.*/)?(?:\.tekton/.*|\.konflux/.*)$
- as: security
optional: true
steps:
env:
PROJECT_NAME: cluster-group-upgrades-operator
SNYK_CODE_ADDITIONAL_ARGS: --severity-threshold=high
workflow: openshift-ci-security
zz_generated_metadata:
branch: release-4.22
org: openshift-kni
repo: cluster-group-upgrades-operator
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
postsubmits:
openshift-kni/cluster-group-upgrades-operator:
- agent: kubernetes
always_run: true
branches:
- ^release-4\.22$
cluster: build01
decorate: true
labels:
ci-operator.openshift.io/is-promotion: "true"
ci.openshift.io/generator: prowgen
max_concurrency: 1
name: branch-ci-openshift-kni-cluster-group-upgrades-operator-release-4.22-images
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
- --promote
- --report-credentials-file=/etc/report/credentials
- --target=[images]
command:
- ci-operator
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/push-secret
name: push-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: push-secret
secret:
secretName: registry-push-credentials-ci-central
- name: result-aggregator
secret:
secretName: result-aggregator
Loading