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

.gitlab-ci.yml

@@ -87,15 +87,15 @@ trigger_build:
 
     # 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
+    - if echo "$F_BRANCH" | 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
+    - if echo "$F_BRANCH" | 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
+    - if echo "$F_BRANCH" | grep -c "^f-grpc-f-.*$"; then
         F_BRANCH=`echo "${F_BRANCH:7}"`;
       fi