ENH: Pipeline should now work with `trigger` keyword.

.gitlab-ci.yml

@@ -53,47 +53,47 @@ build-testenv:
 ######## Test ########
 
 # Run the unit tests with MariaDB
-# unittests-mariadb:
-#   tags: [ docker ]
-#   stage: test
-#   services:
-#     - mariadb:10.4
-
-#   script:
-#     - make pipeline-test SQL_HOST=mariadb
-
-# # Run the unit tests with MySQL 8
-# unittests-mysql-8:
-#   tags: [ docker ]
-#   stage: test
-#   # Should not stop the pipeline from continuing.
-#   allow_failure: true
-#   services:
-#     - name: mysql:8.0
-#       command: ["--default-authentication-plugin=mysql_native_password"]
-
-#   script:
-#     - sed "s/NO_AUTO_CREATE_USER,//" -i tests/example.dump.sql
-#     - rm tests/test_autotap.sql
-#     - make pipeline-test SQL_HOST=mysql
-
-# # Run the unit tests with MySQL 5
-# unittests-mysql-5:
-#   tags: [ docker ]
-#   stage: test
-#   # Should not stop the pipeline from continuing.
-#   allow_failure: true
-#   services:
-#     - name: mysql:5.7
-#       command: ["--default-authentication-plugin=mysql_native_password"]
-
-#   script:
-#     # remove some lines from autotap because the checks of column default
-#     # values don't work with mysql-5
-#     - sed -i "/col_default_is.*NULL/d" tests/test_autotap.sql
-#     - sed -i "/col_default_is.*INACTIVE/d" tests/test_autotap.sql
-#     - sed -i "/col_default_is.*SHA/d" tests/test_autotap.sql
-#     - make pipeline-test SQL_HOST=mysql
+unittests-mariadb:
+  tags: [ docker ]
+  stage: test
+  services:
+    - mariadb:10.4
+
+  script:
+    - make pipeline-test SQL_HOST=mariadb
+
+# Run the unit tests with MySQL 8
+unittests-mysql-8:
+  tags: [ docker ]
+  stage: test
+  # Should not stop the pipeline from continuing.
+  allow_failure: true
+  services:
+    - name: mysql:8.0
+      command: ["--default-authentication-plugin=mysql_native_password"]
+
+  script:
+    - sed "s/NO_AUTO_CREATE_USER,//" -i tests/example.dump.sql
+    - rm tests/test_autotap.sql
+    - make pipeline-test SQL_HOST=mysql
+
+# Run the unit tests with MySQL 5
+unittests-mysql-5:
+  tags: [ docker ]
+  stage: test
+  # Should not stop the pipeline from continuing.
+  allow_failure: true
+  services:
+    - name: mysql:5.7
+      command: ["--default-authentication-plugin=mysql_native_password"]
+
+  script:
+    # remove some lines from autotap because the checks of column default
+    # values don't work with mysql-5
+    - sed -i "/col_default_is.*NULL/d" tests/test_autotap.sql
+    - sed -i "/col_default_is.*INACTIVE/d" tests/test_autotap.sql
+    - sed -i "/col_default_is.*SHA/d" tests/test_autotap.sql
+    - make pipeline-test SQL_HOST=mysql
 
 ######## Deploy ########
 
@@ -101,7 +101,6 @@ build-testenv:
 trigger_build:
   stage: deploy
   variables:
-    TRIGGER_TEST: Test-1
     F_BRANCH: $CI_COMMIT_REF_NAME
     MYSQLBACKEND: $CI_COMMIT_REF_NAME
     TriggerdBy: MYSQLBACKEND
@@ -109,17 +108,7 @@ trigger_build:
 
   trigger:
     project: caosdb/src/caosdb-deploy
-    branch: f-trigger-keyword
-  # script:
-  #   - /usr/bin/curl -X POST
-  #     -F token=$CI_JOB_TOKEN
-  #     -F "variables[TRIGGER_TEST]=Test-1"
-  #     -F "variables[F_BRANCH]=$CI_COMMIT_REF_NAME"
-  #     -F "variables[MYSQLBACKEND]=$CI_COMMIT_REF_NAME"
-  #     -F "variables[TriggerdBy]=MYSQLBACKEND"
-  #     -F "variables[TriggerdByHash]=$CI_COMMIT_SHORT_SHA"
-  #     -F ref=$DEPLOY_REF https://gitlab.indiscale.com/api/v4/projects/14/trigger/pipeline
-
+    branch: $DEPLOY_REF
 
 # Build the sphinx documentation and make it ready for deployment by Gitlab Pages
 # Special job for serving a static website. See https://docs.gitlab.com/ee/ci/yaml/README.html#pages