Replace transient test labels with stable identifiers
This commit is contained in:
parent
4ca7526d50
commit
d0b745950b
4 changed files with 63 additions and 38 deletions
|
|
@ -10,7 +10,7 @@ FIXTURE_LOCK_DIR="${XDG_RUNTIME_DIR:-/tmp/remora-$(id -u)}"
|
|||
FIXTURE_LOCK_PATH="$FIXTURE_LOCK_DIR/remora-testbed-kind.lock"
|
||||
CONTEXT=kind-remora-testbed
|
||||
CLUSTER=remora-testbed
|
||||
NERDCTL_NAMESPACE=remora-wp02
|
||||
NERDCTL_NAMESPACE=remora-dependency-testbed
|
||||
FIXTURE_NAMESPACE=remora-testbed
|
||||
|
||||
set -a
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ metadata:
|
|||
name: probe-payload
|
||||
namespace: remora-testbed
|
||||
data:
|
||||
payload: remora-wp02-published-image-transfer
|
||||
payload: remora-dependency-testbed-published-image-transfer
|
||||
---
|
||||
apiVersion: batch/v1
|
||||
kind: Job
|
||||
|
|
@ -34,28 +34,28 @@ spec:
|
|||
- -v
|
||||
- ON_ERROR_STOP=1
|
||||
- -c
|
||||
- "CREATE TABLE wp02_probe (value text NOT NULL)"
|
||||
- "CREATE TABLE dependency_probe (value text NOT NULL)"
|
||||
- -c
|
||||
- "INSERT INTO wp02_probe VALUES ('passed')"
|
||||
- "INSERT INTO dependency_probe VALUES ('passed')"
|
||||
- -c
|
||||
- "SELECT value = 'passed' FROM wp02_probe"
|
||||
- "SELECT value = 'passed' FROM dependency_probe"
|
||||
env:
|
||||
- {name: PGPASSWORD, value: synthetic-postgres}
|
||||
- name: redis
|
||||
image: @@REDIS_IMAGE@@
|
||||
imagePullPolicy: Never
|
||||
command: [/bin/sh, -ec]
|
||||
args: ["redis-cli -h redis SET wp02 passed && test \"$(redis-cli -h redis GET wp02)\" = passed"]
|
||||
args: ["redis-cli -h redis SET dependency_probe passed && test \"$(redis-cli -h redis GET dependency_probe)\" = passed"]
|
||||
- name: dragonfly
|
||||
image: @@REDIS_IMAGE@@
|
||||
imagePullPolicy: Never
|
||||
command: [/bin/sh, -ec]
|
||||
args: ["redis-cli -h dragonfly SET wp02 passed && test \"$(redis-cli -h dragonfly GET wp02)\" = passed"]
|
||||
args: ["redis-cli -h dragonfly SET dependency_probe passed && test \"$(redis-cli -h dragonfly GET dependency_probe)\" = passed"]
|
||||
- name: vault-write
|
||||
image: @@VAULT_IMAGE@@
|
||||
imagePullPolicy: Never
|
||||
command: [vault]
|
||||
args: [kv, put, secret/wp02, value=passed]
|
||||
args: [kv, put, secret/dependency_probe, value=passed]
|
||||
env:
|
||||
- {name: VAULT_ADDR, value: "http://vault:8200"}
|
||||
- {name: VAULT_TOKEN, value: synthetic-vault-token}
|
||||
|
|
@ -64,7 +64,7 @@ spec:
|
|||
image: @@VAULT_IMAGE@@
|
||||
imagePullPolicy: Never
|
||||
command: [/bin/sh, -ec]
|
||||
args: ["test \"$(vault kv get -field=value secret/wp02)\" = passed && printf 'Vault write/read passed\\n'"]
|
||||
args: ["test \"$(vault kv get -field=value secret/dependency_probe)\" = passed && printf 'Vault write/read passed\\n'"]
|
||||
env:
|
||||
- {name: VAULT_ADDR, value: "http://vault:8200"}
|
||||
- {name: VAULT_TOKEN, value: synthetic-vault-token}
|
||||
|
|
|
|||
|
|
@ -175,11 +175,11 @@ write_helm_values() {
|
|||
fi
|
||||
cat > "$RUNTIME/deployment-values.yaml" <<EOF
|
||||
api:
|
||||
image: {repository: remora-api, tag: wp25, digest: "", pullPolicy: Never}
|
||||
image: {repository: remora-api, tag: local, digest: "", pullPolicy: Never}
|
||||
worker:
|
||||
image: {repository: remora-worker, tag: wp25, digest: "", pullPolicy: Never}
|
||||
image: {repository: remora-worker, tag: local, digest: "", pullPolicy: Never}
|
||||
web:
|
||||
image: {repository: remora-web, tag: wp25, digest: "", pullPolicy: Never}
|
||||
image: {repository: remora-web, tag: local, digest: "", pullPolicy: Never}
|
||||
publicOrigin: $public_origin
|
||||
apiUrl: /v1/
|
||||
oidcClientId: remora-web
|
||||
|
|
@ -432,17 +432,17 @@ validate_deployment_assets
|
|||
"$REMORA_REAL_NERDCTL" --namespace default build \
|
||||
--file "$ROOT/Dockerfile" \
|
||||
--target api \
|
||||
--tag remora-api:wp25 \
|
||||
--tag remora-api:local \
|
||||
"$ROOT"
|
||||
"$REMORA_REAL_NERDCTL" --namespace default build \
|
||||
--file "$ROOT/Dockerfile" \
|
||||
--target worker \
|
||||
--tag remora-worker:wp25 \
|
||||
--tag remora-worker:local \
|
||||
"$ROOT"
|
||||
"$REMORA_REAL_NERDCTL" --namespace default build \
|
||||
--file "$ROOT/Dockerfile" \
|
||||
--target web \
|
||||
--tag remora-web:wp25 \
|
||||
--tag remora-web:local \
|
||||
"$ROOT"
|
||||
"$REMORA_REAL_NERDCTL" --namespace default build \
|
||||
--file "$ROOT/Dockerfile.test" \
|
||||
|
|
@ -462,9 +462,9 @@ setup_fixture durable coordination oidc target secret
|
|||
if [[ "${REMORA_SYSTEM_QUALIFICATION:-0}" = 1 ]]; then
|
||||
install_qualification_ingress
|
||||
fi
|
||||
load_local_image remora-api:wp25
|
||||
load_local_image remora-worker:wp25
|
||||
load_local_image remora-web:wp25
|
||||
load_local_image remora-api:local
|
||||
load_local_image remora-worker:local
|
||||
load_local_image remora-web:local
|
||||
load_local_image remora-kind-deployment:local
|
||||
if [[ "${REMORA_SYSTEM_QUALIFICATION:-0}" = 1 ]]; then
|
||||
load_local_image remora-kind-web-system:local
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ cleanup() {
|
|||
status=1
|
||||
fi
|
||||
if [[ "$status" = 0 ]] && [[ "$SUCCEEDED" = true ]]; then
|
||||
printf 'WP-02 hermetic dependency testbed passed\n'
|
||||
printf 'hermetic dependency testbed passed\n'
|
||||
fi
|
||||
exit "$status"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue