From 7b27dbeb1578800dbd1d0f6be4ee7a11d17f8add Mon Sep 17 00:00:00 2001
From: Daniel Hornung <d.hornung@indiscale.com>
Date: Wed, 8 Jun 2022 16:49:19 +0200
Subject: [PATCH] WIP: Re-enable tests.

---
 .gitlab-ci.yml | 84 +++++++++++++++++++++++++-------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6dab98..e66c98e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,48 +52,48 @@ 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
+# 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
 
 ######## Deploy ########
 
-- 
GitLab