From 7620567379481a0a9d01ae579841086698ff2265 Mon Sep 17 00:00:00 2001 From: Daniel Hornung <d.hornung@indiscale.com> Date: Wed, 8 Jun 2022 15:08:35 +0200 Subject: [PATCH] WIP: simplify pipeline. --- .gitlab-ci.yml | 82 +++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9461ae2..5a002b3 100644 --- a/.gitlab-ci.yml +++ b/.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 ######## -- GitLab