Fix copy of main rabbitmq secrets to geosphere-test namespace

ci_geosphere-test/gitlab-ci.yaml

@@ -40,11 +40,6 @@ gstest deploy rabbit:
   stage: deploy rabbit
   script:
     - ./helpers/deploy_rabbitmq.sh ci_geosphere-test
-    - cp ${kubekorner_k3s_config} .
-    - kubeconfig=$(basename ${kubekorner_k3s_config})
-    # FIXME: This may never run. This should be put on the production side
-    - |-
-      kubectl get secret --kubeconfig "${kubeconfig}" geosphere-rabbit-rabbitmq --namespace=geosphere -oyaml | grep -v '^\s*namespace:\s' | grep -v "helm" | sed 's/ name: .*/ name: geosphere-rabbit-rabbitmq-production/' | kubectl apply --kubeconfig "${kubeconfig}" --namespace=geosphere-test -f -
   # this job doesn't actually need any artifacts from previous jobs
   dependencies: []
   rules:

ci_geosphere/gitlab-ci.yaml

@@ -57,6 +57,10 @@ gs deploy rabbit:
   stage: deploy rabbit
   script:
     - ./helpers/deploy_rabbitmq.sh ci_geosphere
+    - cp ${kubekorner_k3s_config} .
+    - kubeconfig=$(basename ${kubekorner_k3s_config})
+    - |-
+      kubectl get secret --kubeconfig "${kubeconfig}" geosphere-rabbit-rabbitmq --namespace=geosphere -oyaml | grep -v '^\s*namespace:\s' | grep -v "helm" | sed 's/ name: .*/ name: geosphere-rabbit-rabbitmq-production/' | kubectl apply --kubeconfig "${kubeconfig}" --namespace=geosphere-test -f -
   # this job doesn't actually need any artifacts from previous jobs
   dependencies: []
   rules:

helpers/deploy_rabbitmq.sh

@@ -32,7 +32,7 @@ if [[ "$sec_info" != "" ]]; then
     ec=$(kubectl --kubeconfig $kubeconfig get secret --namespace $ns $auth_sec -o jsonpath="{.data.rabbitmq-erlang-cookie}" | base64 -d);
     EXTRA_ARGS="--set auth.password=$pw --set auth.erlangCookie=$ec";
 fi
-echo $EXTRA_ARGS
+echo "Adding extra arguments: $EXTRA_ARGS"
 # install third-party rabbitmq server
 helm repo add bitnami "https://charts.bitnami.com/bitnami"
 helm upgrade -v 2 --install --kubeconfig $kubeconfig -f ${values_base}/values-geosphere-rabbit.yaml $EXTRA_ARGS --namespace $ns geosphere-rabbit bitnami/rabbitmq