Skip to content

Commit 00c4573

Browse files
committed
e2e: set overridden bundle images with unique names
1 parent 69bcdba commit 00c4573

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

stackgres-k8s/ci/utils/glabw

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22

33
mkdir -p ~/.config/glab-cli
4-
docker run -u "$(id -u):$(id -g)" -v /etc/passwd:/etc/passwd:ro -v "$HOME":"$HOME":ro -e PROMPT_COMMAND= --rm -ti -v "$(pwd):$(pwd)" -w "$(pwd)" -v "$HOME/.config/glab-cli:$HOME/.config/glab-cli" registry.gitlab.com/gitlab-org/cli glab "$@"
4+
docker run -u "$(id -u):$(id -g)" -v /etc/passwd:/etc/passwd:ro -v "$HOME":"$HOME":ro -e PROMPT_COMMAND= --rm $([ -t 1 ] && printf %s -t) -i -v "$(pwd):$(pwd)" -w "$(pwd)" -v "$HOME/.config/glab-cli:$HOME/.config/glab-cli" registry.gitlab.com/gitlab-org/cli glab "$@"

stackgres-k8s/e2e/spec/dbops-security-upgrade-olm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ $(
5757
| sed 's/^/ /'
5858
)
5959
EOF
60-
BUNDLE_IMAGE_NAME="${BUNDLE_IMAGE_NAME}-overridden"
60+
BUNDLE_IMAGE_NAME="${BUNDLE_IMAGE_NAME}-overridden-$(date +%s)-$RANDOM"
6161
docker build -t "$BUNDLE_IMAGE_NAME" -f "$LOG_PATH/operator-bundle.Dockerfile" "$LOG_PATH/operator-bundle"
6262
docker push "$BUNDLE_IMAGE_NAME"
6363
}

stackgres-k8s/e2e/spec/operator-olm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ $(
516516
| sed 's/^/ /'
517517
)
518518
EOF
519-
BUNDLE_IMAGE_NAME="${BUNDLE_IMAGE_NAME}-overridden"
519+
BUNDLE_IMAGE_NAME="${BUNDLE_IMAGE_NAME}-overridden-$(date +%s)-$RANDOM"
520520
docker build -t "$BUNDLE_IMAGE_NAME" -f "$LOG_PATH/operator-bundle.Dockerfile" "$LOG_PATH/operator-bundle"
521521
docker push "$BUNDLE_IMAGE_NAME"
522522
}

stackgres-k8s/e2e/spec/previous/1.13/spec/default-mutator

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ e2e_test_install() {
1616

1717
PGCONFIG_FIELDS=36
1818
LOGS_PGCONFIG_FIELDS=37
19-
PGCONFIG_DEFAULTS_PARAMETERS=53
19+
PGCONFIG_DEFAULTS_PARAMETERS=52
2020

2121
PGBOUNCER_FIELDS=6
22-
PGBOUNCER_DEFAULTS_PARAMETERS=14
22+
PGBOUNCER_DEFAULTS_PARAMETERS=13
2323

2424
kubectl create namespace "$CLUSTER_NAMESPACE"
2525
deploy_curl_pod "$CLUSTER_NAMESPACE"

stackgres-k8s/e2e/spec/previous/1.14/spec/default-mutator

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ e2e_test_install() {
1616

1717
PGCONFIG_FIELDS=36
1818
LOGS_PGCONFIG_FIELDS=37
19-
PGCONFIG_DEFAULTS_PARAMETERS=53
19+
PGCONFIG_DEFAULTS_PARAMETERS=52
2020

2121
PGBOUNCER_FIELDS=6
22-
PGBOUNCER_DEFAULTS_PARAMETERS=14
22+
PGBOUNCER_DEFAULTS_PARAMETERS=13
2323

2424
kubectl create namespace "$CLUSTER_NAMESPACE"
2525
deploy_curl_pod "$CLUSTER_NAMESPACE"

0 commit comments

Comments
 (0)