use two data definitions with different name in secret values

filter for href

.gitlab-ci.yml

@@ -36,15 +36,15 @@ integration-test:
     - export PREPROCESSOR_RESULTS_BUCKET=$(cat /proc/sys/kernel/random/uuid)
     - kubectl apply -f testing/pvc-redis.yaml
     # default timeout is 5 min, move to 8m for some leeway
-    - helm install my-helm-release . --wait --timeout 10m --values ./testing/values-testing.yaml --values "${SECRET_HELM_VALUES_TESTING}" --set global.storage.target.container=${PREPROCESSOR_RESULTS_BUCKET}
+    - helm install my-helm-release . --wait --timeout 10m --values ./testing/values-testing.yaml --values "${SECRET_HELM_VALUES_TESTING}" --set global.storage.target.container=${PREPROCESSOR_RESULTS_BUCKET} --set global.storage.data.swift-data-fullpipeline.container=${PREPROCESSOR_RESULTS_BUCKET}
     - kubectl get po -A
-    - mkdir "${CI_PROJECT_DIR}/logs"
   script:
     - cd testing && ./run_integration_test.sh
   after_script:
     # print info in case anything has gone wrong
     - kubectl get po -A || true
     # fetch all pod logs
+    - mkdir "${CI_PROJECT_DIR}/logs"
     - kubectl get po -o name | while read POD ; do kubectl logs "$POD" >> "${CI_PROJECT_DIR}/logs/$(echo $POD | cut -d'/' -f2).txt" ; done || true
     - k3d cluster delete testgitlabci-${CI_JOB_ID}
   artifacts:

testing/run_integration_test.sh

@@ -45,16 +45,9 @@ KUBECTL_PORT_FORWARD_PID=$!
 pytest test_preprocessor.py test_registrar.py test_renderer.py
 let "TEST_RESULT+=$?"
 
-# save logs of pods that are to be restarted due to helm upgrade
-kubectl get po -o name | grep 'preprocessor\|registrar' | while read POD ; do kubectl logs "$POD" >> "${CI_PROJECT_DIR}/logs/$(echo $POD | cut -d'/' -f2).txt" ; done || true
-# update used values and bucket used in registrar/preprocessor for full pipeline test
-helm upgrade my-helm-release ../ --values values-testing.yaml --values "${SECRET_HELM_VALUES_TESTING_FULLPIPELINE}" --set global.storage.data.swift-data-fullpipeline.container="${PREPROCESSOR_RESULTS_BUCKET}" --set global.storage.target.container=${PREPROCESSOR_RESULTS_BUCKET}
-
 swift delete "${PREPROCESSOR_RESULTS_BUCKET}"
 swift delete "${PREPROCESSOR_RESULTS_BUCKET}_segments"
 
-sleep 30 # to allow new pods to replace the old one after helm upgrade
-
 # ingestor tests
 kubectl cp ./tpzonlineitem.xml default/$(kubectl get po -l app.kubernetes.io/name=ingestor -o name | cut -d'/' -f2):/mnt/data
 kubectl cp ./defected_report.xml default/$(kubectl get po -l app.kubernetes.io/name=ingestor -o name | cut -d'/' -f2):/mnt/data
@@ -63,7 +56,6 @@ sleep 15  # run ingestor
 kubectl exec deployment/my-helm-release-ingestor -- ls /var/ingestor/success > success_list.csv
 kubectl exec deployment/my-helm-release-ingestor -- ls /var/ingestor/fail > failure_list.csv
 
-
 #client
 #TODO
 
@@ -75,6 +67,9 @@ let "TEST_RESULT+=$?"
 pytest --fullpipeline test_renderer.py test_registrar.py
 let "TEST_RESULT+=$?"
 
+swift delete "${PREPROCESSOR_RESULTS_BUCKET}"
+swift delete "${PREPROCESSOR_RESULTS_BUCKET}_segments"
+
 kill $KUBECTL_PORT_FORWARD_PID
 
 exit $TEST_RESULT