Skip to content

test: add clusterresourceoverride-operator upgrade test enhancements #81424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maxcao13 wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −1
Open

test: add clusterresourceoverride-operator upgrade test enhancements #81424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion ...rride-admission-operator/openshift-cluster-resource-override-admission-operator-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ base_images:
name: "4.22"
namespace: ocp
tag: cluster-resource-override-admission-operator-bundle
previous-operand:
name: "4.22"
namespace: ocp
tag: cluster-resource-override-admission
previous-operator:
name: "4.22"
namespace: ocp
Expand Down Expand Up @@ -131,6 +135,7 @@ tests:
export OLD_CSV_NAME=$(oc get csv -n $NS -o jsonpath='{.items[0].metadata.name}')

oc patch csv -n $NS $OLD_CSV_NAME --type='json' -p="[{\"op\": \"replace\", \"path\": \"/spec/install/spec/deployments/0/spec/template/spec/containers/0/image\", \"value\": \"$PREVIOUS_OPERATOR\"}]"
oc patch csv -n $NS $OLD_CSV_NAME --type='json' -p="[{\"op\": \"replace\", \"path\": \"/spec/install/spec/deployments/0/spec/template/spec/containers/0/env/2/value\", \"value\": \"$PREVIOUS_OPERAND\"}]"
sleep 10

# Delete the deployment which will then be recreated by the subscription controller with the correct image.
Expand All @@ -143,10 +148,21 @@ tests:
name: previous-bundle
- env: PREVIOUS_OPERATOR
name: previous-operator
- env: PREVIOUS_OPERAND
name: previous-operand
from: operator-sdk
resources:
requests:
cpu: 100m
- as: pre-check
cli: latest
commands: |
export KUBECTL=$(which oc)
make e2e-upgrade-pre
from: src
resources:
requests:
cpu: 100m
- as: upgrade
cli: latest
commands: |
Expand All @@ -163,7 +179,7 @@ tests:
cli: latest
commands: |
export KUBECTL=$(which oc)
make e2e
make e2e-upgrade-post e2e
from: src
resources:
requests:
Expand Down