From dc80f24b847b7ab24f5ae093dee9eb6ee33596ae Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Mon, 31 Jul 2023 18:28:58 +0200 Subject: [PATCH] update launch.sh and ci_test.sh --- jsonnetfile.lock.json | 10 ---------- tests/ci/ci_test.sh | 7 +------ tests/deploy/launch.sh | 2 ++ 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 55799a80d0..0883ed86da 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -306,16 +306,6 @@ "version": "76213272326b432a504dd59db593b94890541342", "sum": "h+pIb5Vnc+Dcpu1awzb9HLTHa+Hv1q6OAoIqbgxgHsk=" }, - { - "source": { - "git": { - "remote": "https://github.com/parca-dev/parca.git", - "subdir": "deploy/lib/parca" - } - }, - "version": "bc35eaf54ea6b9d7ea46b6c0fe2194084962765b", - "sum": "aK56fC0SsHbSg0WZfRiDTntO72QJqftVgORDae2ilyg=" - }, { "source": { "git": { diff --git a/tests/ci/ci_test.sh b/tests/ci/ci_test.sh index f699b18fb0..a4c65c8a9d 100755 --- a/tests/ci/ci_test.sh +++ b/tests/ci/ci_test.sh @@ -56,6 +56,7 @@ observatorium_tools(){ oc wait --for=jsonpath='{.status.phase}=Active' namespace/observatorium-tools --timeout=5s oc apply --namespace observatorium-tools -f ../deploy/manifests/observatorium-tools-network-policy.yaml oc process --param-file=env/logging.test.ci.env -f ../../resources/services/meta-monitoring/logging-template.yaml | oc apply --namespace observatorium-tools -f - + oc process --param-file=env/observatorium-parca.test.ci.env -f ../../resources/services/meta-monitoring/profiling-template.yaml | oc apply --namespace observatorium-tools -f - } observatorium() { @@ -63,15 +64,9 @@ observatorium() { oc apply -f ../deploy/manifests/observatorium-rules-objstore-secret.yaml --namespace observatorium oc apply -f ../deploy/manifests/observatorium-rhobs-tenant-secret.yaml --namespace observatorium oc apply --namespace observatorium -f ../deploy/manifests/observatorium-service-account.yaml - oc apply -f ../deploy/manifests/observatorium-parca-secret.yaml --namespace observatorium - oc process -f ../../resources/services/parca-observatorium-remote-ns-rbac-template.yaml | \ - oc apply -f - oc process --param-file=env/observatorium.test.ci.env \ -f ../../resources/services/observatorium-template.yaml | \ oc apply --namespace observatorium -f - - oc process --param-file=env/observatorium-parca.test.ci.env \ - -f ../../resources/services/parca-template.yaml| \ - oc apply --namespace observatorium -f - oc process --param-file=env/observatorium-jaeger.test.ci.env \ -f ../../resources/services/jaeger-template.yaml| \ oc apply --namespace observatorium -f - diff --git a/tests/deploy/launch.sh b/tests/deploy/launch.sh index c9ef5a6b0d..6cfe8193b0 100755 --- a/tests/deploy/launch.sh +++ b/tests/deploy/launch.sh @@ -31,6 +31,8 @@ observatorium_tools(){ oc create ns observatorium-tools || true oc apply --namespace observatorium-tools -f manifests/observatorium-tools-network-policy.yaml oc process --param-file=env/logging.test.env -f ../../resources/services/meta-monitoring/logging-template.yaml | oc apply --namespace observatorium-tools -f - + oc process --param-file=env/observatorium-parca.test.env -f ../../resources/services/meta-monitoring/profiling-template.yaml | oc apply --namespace observatorium-tools -f - + } logging(){