Skip to content

Commit 4b49361

Browse files
tplavcichors
andauthored
K8SPSMDB-886 - Fix default-cr test and OPERATOR_VERSION in functions (#1322)
* K8SPSMDB-886 - Fix default-cr test and OPERATOR_VERSION in functions * Update e2e-tests/functions Co-authored-by: Viacheslav Sarzhan <[email protected]> --------- Co-authored-by: Viacheslav Sarzhan <[email protected]>
1 parent 2709599 commit 4b49361

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

e2e-tests/default-cr/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function stop_cluster() {
2525
&& [[ $(kubectl_bin get psmdb ${cluster_name} -o jsonpath='{.status.replsets.rs0.ready}') -le 0 ]]; do
2626
echo -n .
2727
let passed_time="${passed_time}+${sleep_time}"
28-
sleep ${passed_time}
28+
sleep ${sleep_time}
2929
if [[ ${passed_time} -gt ${max_wait_time} ]]; then
3030
echo "We've been waiting for cluster stop for too long. Exiting..."
3131
exit 1

e2e-tests/functions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
GIT_COMMIT=$(git rev-parse HEAD)
44
GIT_BRANCH=${VERSION:-$(git rev-parse --abbrev-ref HEAD | sed -e 's^/^-^g; s^[.]^-^g;' | sed -e 's/_/-/g' | tr '[:upper:]' '[:lower:]')}
55
API="psmdb.percona.com/v1"
6-
OPERATOR_VERSION="$(yq eval '.spec.crVersion' $(realpath $test_dir/../../deploy/cr.yaml))"
6+
OPERATOR_VERSION="$(grep 'crVersion' $(realpath $(dirname ${BASH_SOURCE[0]})/../deploy/cr.yaml) | awk '{print $2}')"
77
IMAGE=${IMAGE:-"perconalab/percona-server-mongodb-operator:${GIT_BRANCH}"}
88
IMAGE_PMM=${IMAGE_PMM:-"perconalab/pmm-client:dev-latest"}
99
IMAGE_MONGOD=${IMAGE_MONGOD:-"perconalab/percona-server-mongodb-operator:main-mongod5.0"}

0 commit comments

Comments
 (0)