update launch.sh and ci_test.sh

rhobs · Jul 31, 2023 · dc80f24 · dc80f24
1 parent 821da19
commit dc80f24
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git 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
@@ -56,22 +56,17 @@ 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() {
     oc wait --for=jsonpath='{.status.phase}=Active' namespace/observatorium --timeout=5s
     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
@@ -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(){