Skip to content
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

control-service: use full url for heartbeat tests and heartbeat tests run in multiple namespaces #2295

Merged
merged 17 commits into from
Jul 25, 2023
Merged

control-service: use full url for heartbeat tests and heartbeat tests run in multiple namespaces #2295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e6bbcdb
control-service: use full url for control service
Jun 21, 2023
7908a3e
control-service: use full url for control service
Jun 21, 2023
be3765d
control-service: use full url for control service
Jun 21, 2023
086938b
control-service: use full url for control service
Jun 21, 2023
2abc6b3
control-service: use full url for control service
Jun 21, 2023
42676b4
control-service: use full url for control service
Jun 21, 2023
adfd41d
control-service:fix failing pipelines
Jun 27, 2023
37e47d6
control-service:fix failing pipelines
Jun 27, 2023
331226e
control-service:fix failing pipelines
Jun 27, 2023
ac99f66
control-service:fix failing pipelines
Jun 27, 2023
ae21078
control-service:fix failing pipelines
Jun 27, 2023
cc8eb57
control-service: test trino full url
Jul 24, 2023
59e4f02
control-service: test trino full url
Jul 24, 2023
669d220
control-service: test trino full url
Jul 24, 2023
ced2be1
control-service: test trino full url
Jul 24, 2023
301b399
control-service: test trino full url
Jul 24, 2023
1cdcae1
control-service: test trino full url
Jul 24, 2023
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
7 changes: 4 additions & 3 deletions projects/control-service/cicd/deploy-testing-pipelines-service.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,13 @@ if [ "$RUN_ENVIRONMENT_SETUP" = 'y' ]; then
kubectl patch serviceaccount default -p '{"imagePullSecrets":[{"name":"'$secret_name'"},{"name":"'$dockerhub_secretname'"}]}'

fi

fi

# this is the internal hostname of the Control Service.
# Since all tests (gitlab runners) are installed inside it's easier if we use it.
export CONTROL_SERVICE_URL=${CONTROL_SERVICE_URL:-"http://cicd-control-service-svc:8092"}
export CONTROL_SERVICE_URL=${CONTROL_SERVICE_URL:-"http://cicd-control-service-svc.cicd.svc.cluster.local:8092"}
# Trino host used by data jobs
export TRINO_HOST=${TRINO_HOST:-"test-trino"}
export TRINO_HOST=${TRINO_HOST:-"test-trino.cicd.svc.cluster.local"}

# Update vdk-options with substituted variables like sensitive configuration (passwords)
export VDK_OPTIONS_SUBSTITUTED="${VDK_OPTIONS}.temp"
Expand Down Expand Up @@ -113,5 +112,7 @@ helm upgrade --install --debug --wait --timeout 10m0s $RELEASE_NAME . \
--set security.oauth2.jwtJwkSetUri=https://console-stg.cloud.vmware.com/csp/gateway/am/api/auth/token-public-key?format=jwks \
--set security.oauth2.jwtIssuerUrl=https://gaz-preview.csp-vidm-prod.com \
--set security.authorizationEnabled=false \
--set deploymentK8sNamespace="cicd-deployment" \
--set controlK8sNamespace="cicd-control" \
--set extraEnvVars.LOGGING_LEVEL_COM_VMWARE_TAURUS=DEBUG \
--set extraEnvVars.DATAJOBS_TELEMETRY_WEBHOOK_ENDPOINT="https://vcsa.vmware.com/ph-stg/api/hyper/send?_c=taurus.v0&_i=cicd-control-service"
2 changes: 1 addition & 1 deletion projects/control-service/cicd/post_deploy_test_heartbeat_config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ DB_DEFAULT_TYPE=TRINO

VDK_COMMAND_NAME=vdk

CONTROL_API_URL=http://cicd-control-service-svc:8092
CONTROL_API_URL=http://cicd-control-service-svc.cicd.svc.cluster.local:8092
2 changes: 1 addition & 1 deletion projects/vdk-control-cli/cicd/release_test_heartbeat_config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Genereate with https://console-stg.cloud.vmware.com/csp/gateway/portal/#/user/tokens
# VDKCLI_OAUTH2_REFRESH_TOKEN= passed as environment variable
VDKCLI_OAUTH2_URI=https://console-stg.cloud.vmware.com/csp/gateway/am/api/auth/api-tokens/authorize
CONTROL_API_URL=http://cicd-control-service-svc:8092
CONTROL_API_URL=http://cicd-control-service-svc.cicd.svc.cluster.local:8092

JOB_RUN_TEST_MODULE_NAME=vdk.internal.heartbeat.simple_run_test
JOB_RUN_TEST_CLASS_NAME=SimpleRunTest
Expand Down
2 changes: 1 addition & 1 deletion projects/vdk-heartbeat/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ th control service and the frontend are deployed to the same host by the helm
chart.

```
CONTROL_API_URL=http://cicd-control-service-svc:8092
CONTROL_API_URL=http://cicd-control-service-svc.cicd.svc.cluster.local:8092
```

The test sends a `GET` request to the URL and expects a success response
2 changes: 1 addition & 1 deletion projects/vdk-plugins/quickstart-vdk/cicd/release_acceptance_test_heartbeat_config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Generate with https://console-stg.cloud.vmware.com/csp/gateway/portal/#/user/tokens
# VDKCLI_OAUTH2_REFRESH_TOKEN= passed as environment variable
VDKCLI_OAUTH2_URI=https://console-stg.cloud.vmware.com/csp/gateway/am/api/auth/api-tokens/authorize
CONTROL_API_URL=http://cicd-control-service-svc:8092
CONTROL_API_URL=http://cicd-control-service-svc.cicd.svc.cluster.local:8092

JOB_RUN_TEST_MODULE_NAME=vdk.internal.heartbeat.simple_run_test
JOB_RUN_TEST_CLASS_NAME=SimpleRunTest
Expand Down