Merge branch 'f-grpc-main' into f-grpc-dev

.gitlab-ci.yml

@@ -83,26 +83,26 @@ trigger_build:
   tags: [ docker ]
   stage: deploy
   script:
-    - SERVER="${CI_COMMIT_REF_NAME}"
     - F_BRANCH="${CI_COMMIT_REF_NAME}"
 
-    # TODO special settings for f-grpc - remove me
-    - F_BRANCH=main
+    # TODO remove, this is grpc-special stuff
     # server in f-grpc-dev branch matches with dev branch of cpplib/cppinttest
     - if echo "$SERVER" | grep -c "^f-grpc-dev$"; then
         F_BRANCH=dev;
       fi
+    # server in f-grpc-main branch matches with main branch of cpplib/cppinttest
+    - if echo "$SERVER" | grep -c "^f-grpc-main$"; then
+        F_BRANCH=main;
+      fi
     # server in f-grpc-f-something branch matches with f-something branch of cpplib/cppinttest
     - if echo "$SERVER" | grep -c "^f-grpc-f-.*$"; then
         F_BRANCH=`echo "${F_BRANCH:7}"`;
       fi
 
-
-    - echo "Triggering pipeline ${DEPLOY_PIPELINE}@${DEPLOY_REF} with F_BRANCH=${F_BRANCH} and SERVER=${SERVER}"
+    - echo "Triggering pipeline ${DEPLOY_PIPELINE}@${DEPLOY_REF} with F_BRANCH=${F_BRANCH}"
     - /usr/bin/curl -X POST
       -F token=$CI_JOB_TOKEN
       -F "variables[F_BRANCH]=$F_BRANCH"
-      -F "variables[SERVER]=$SERVER"
       -F "variables[TRIGGERED_BY_REPO]=$TRIGGERED_BY_REPO"
       -F "variables[TRIGGERED_BY_REF]=$TRIGGERED_BY_REF"
       -F "variables[TRIGGERED_BY_HASH]=$TRIGGERED_BY_HASH"