Merge branch 'Anne/CIfix' into 'release'

Fixes for portable CI

See merge request !662

.gitlab-ci.yml

-# From: https://about.gitlab.com/2017/09/21/how-to-create-ci-cd-pipeline-with-autodeploy-to-kubernetes-using-gitlab-and-helm/
-
-variables:
-  REPO_DIR: gitlab.com/elixxir
-  REPO_NAME: client
-  DOCKER_IMAGE: elixxirlabs/cuda-go:go1.16-cuda11.1
-  MIN_CODE_COVERAGE: "35"
-
 before_script:
-  ##
-  ## Go Setup
-  ##
   - go version || echo "Go executable not found."
   - echo $CI_BUILD_REF
   - echo $CI_PROJECT_DIR
@@ -23,12 +12,10 @@ before_script:
   - git config --global url."git@$GITLAB_SERVER:".insteadOf "https://git.xx.network/"
   - export PATH=$HOME/go/bin:$PATH
 
-
 stages:
   - test
   - build
   - trigger_integration
-  - trigger_release_integration
 
 test:
   stage: test
@@ -65,9 +52,9 @@ build:
     - tags
   script:
     - mkdir -p release
-    - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' ./...
+#    - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' ./...
     - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.linux64 main.go
-    - GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.win64 main.go
+#    - GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.win64 main.go
 #    - GOOS=windows GOARCH=386 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.win32 main.go
     - GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.darwin64 main.go
     - /upload-artifacts.sh release/
@@ -81,7 +68,7 @@ tag:
         - master
     image: $DOCKER_IMAGE
     script:
-        - git remote add origin_tags git@gitlab.com:elixxir/client.git || true
+        - git remote add origin_tags git@$GITLAB_SERVER:elixxir/client.git || true
         - git tag $(release/client.linux64 version | grep "Elixxir Client v"| cut -d ' ' -f3) -f
         - git push origin_tags -f --tags
 
@@ -116,22 +103,20 @@ bindings-android:
       - bindings.aar
       - bindings-sources.jar
 
-trigger_integration:
+trigger-integration:
   stage: trigger_integration
-  script:
-    # UDB
-    - "curl -X POST -F token=dcf1a672991bbc2520e96cea271b5a -F ref=master https://gitlab.com/api/v4/projects/6317316/trigger/pipeline"
-    # integration
-    - "curl -X POST -F token=e34aa19ef1530e579c5d590873d3c6 -F ref=master https://gitlab.com/api/v4/projects/5615854/trigger/pipeline"
+  trigger:
+    project: elixxir/integration
+    branch: $CI_COMMIT_REF_NAME
   only:
     - master
+    - release
 
-trigger_release_integration:
-  stage: trigger_release_integration
-  script:
-    # UDB
-    - "curl -X POST -F token=dcf1a672991bbc2520e96cea271b5a -F ref=release https://gitlab.com/api/v4/projects/6317316/trigger/pipeline"
-    # integration
-    - "curl -X POST -F token=e34aa19ef1530e579c5d590873d3c6 -F ref=release -F \"variables[CLIENT_ID]=release\" -F \"variables[GATEWAY_ID]=release\" -F \"variables[REGISTRATION_ID]=release\" -F \"variables[SERVER_ID]=release\" -F \"variables[UDB_ID]=release\" https://gitlab.com/api/v4/projects/5615854/trigger/pipeline"
+trigger-udb:
+  stage: trigger_integration
+  trigger:
+    project: elixxir/user-discovery-bot
+    branch: $CI_COMMIT_REF_NAME
   only:
+    - master
     - release