ci: include testenv_post stage

khys95 · Aug 13, 2024 · f7bc581 · f7bc581
1 parent fbdf267
commit f7bc581
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -382,31 +382,31 @@ Prepare k8s environment:
 #
 # collect all logs
 #
-#Collect container logs:
-#  stage: testenv_post
-#  extends: .kubernetes_image
-#  when: always
-#  allow_failure: true
-#  script:
-#    - kubectl -n $K8S_NAMESPACE get pods | grep Running | awk '{print $1}' | xargs -n1 kubectl -n $K8S_NAMESPACE logs | tee $K8S_NAMESPACE.log
-#    - kubectl -n $K8S_NAMESPACE run -i --rm --restart=Never -q --image=edenhill/kcat:1.7.1 kcat -- kcat -C -t billing -b billing-kafka:9092 -p 0 -e -q | tee $K8S_NAMESPACE-billing.json
-#  artifacts:
-#    name: "logs-$CI_PIPELINE_ID"
-#    paths:
-#      - "$K8S_NAMESPACE.log"
-#      - "$K8S_NAMESPACE-billing.json"
-#
-##
-## dispose kubernetes resources
-##
-#Clean k8s environment:
-#  stage: testenv_post
-#  extends: .kubernetes_image
-#  needs:
-#    - Collect container logs
-#  when: always
-#  script:
-#    - kubectl delete namespace ${K8S_NAMESPACE} --grace-period=1 --ignore-not-found=true
+Collect container logs:
+  stage: testenv_post
+  extends: .kubernetes_image
+  when: always
+  allow_failure: true
+  script:
+    - kubectl -n $K8S_NAMESPACE get pods | grep Running | awk '{print $1}' | xargs -n1 kubectl -n $K8S_NAMESPACE logs | tee $K8S_NAMESPACE.log
+    - kubectl -n $K8S_NAMESPACE run -i --rm --restart=Never -q --image=edenhill/kcat:1.7.1 kcat -- kcat -C -t billing -b billing-kafka:9092 -p 0 -e -q | tee $K8S_NAMESPACE-billing.json
+  artifacts:
+    name: "logs-$CI_PIPELINE_ID"
+    paths:
+      - "$K8S_NAMESPACE.log"
+      - "$K8S_NAMESPACE-billing.json"
+
+#
+# dispose kubernetes resources
+#
+Clean k8s environment:
+  stage: testenv_post
+  extends: .kubernetes_image
+  needs:
+    - Collect container logs
+  when: always
+  script:
+    - kubectl delete namespace ${K8S_NAMESPACE} --grace-period=1 --ignore-not-found=true
 
 #
 # infrastructure required to run dCache

diff --git a/http-client.private.env.json b/http-client.private.env.json
@@ -12,9 +12,9 @@
     "qos-policy": "/qos-policy",
     "namespace": "/namespace",
     "labels": "/labels",
-    "sourcePool" : "pool_write",
+    "sourcePool" : "\"pool_write\"",
     "target": "hsm",
-    "targetPools": "pool_res1",
+    "targetPools": "\"pool_res1\"",
     "osm_targetPools": "\"osm\"",
     "wrong_src_pool_name" :  "wrong_src_pool_name",
     "wrong_target_pool_name" : "wrong_target_pool_name",