Commit 78c819b1 authored by Thomas Braun's avatar Thomas Braun
Browse files

.gitlab-ci.yml: Prefer ready made cppTango CI docker images 

While at it we also switch to cppTango main for running the tests.
parent 8fccecd4

.gitlab-ci.yml

+12 −25
Original line number Diff line number Diff line
@@ -106,28 +106,19 @@ run-tests-with-mariadb: 
    - amd64

    - docker

    - linux

  image: debian:bookworm

  image: registry.gitlab.com/tango-controls/docker/ci/cpp/debian12:cppTango_version_main

  before_script:

    - apt-get update

    - sudo apt-get update

    - >

      apt-get install -y

      build-essential

      cmake

      sudo apt-get install -y

      libboost-test-dev

      libtango-dev

      libmariadb-dev-compat

      mariadb-server

      pipx

      python3

      sudo

    - pipx install gcovr==8.4

    - pipx ensurepath

    - source ~/.bashrc

    - sudo cp ci/99_non-default-port.cnf /etc/mysql/mariadb.conf.d

    - sudo cp ci/debian.cnf /etc/mysql

    - service mariadb restart

    - sudo service mariadb restart

    - sudo mysql --defaults-file=/etc/mysql/debian.cnf -u root -e "SET PASSWORD = PASSWORD('secret');"

    - echo "TANGO_HOST=127.0.0.1:10000" > /etc/tangorc

    - echo "TANGO_HOST=127.0.0.1:10000" | sudo tee -a /etc/tangorc

  script:

    - cmake -B build -S . -G Ninja -DTDB_ENABLE_COVERAGE=ON -DBUILD_TESTING=ON -DMYSQL_ADMIN=root -DMYSQL_HOST="127.0.0.1:4711" -DMYSQL_ADMIN_PASSWD=secret

    - cmake --build build
@@ -167,23 +158,19 @@ run-tests-with-mysql: 
    - amd64

    - docker

    - linux

  image: ubuntu:noble

  image: registry.gitlab.com/tango-controls/docker/ci/cpp/ubuntu-24.04:cppTango_version_main

  before_script:

    - apt-get update

    - sudo apt-get update

    - >

      apt-get install -y

      build-essential

      cmake

      sudo apt-get install -y

      libboost-test-dev

      libtango-dev

      libmysqlclient-dev

      mysql-server

      sudo

    - service mysql restart

    - sudo mysql -u root -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'secret';"

    - echo "TANGO_HOST=127.0.0.1:10000" > /etc/tangorc

    - sudo service mysql restart

    - sudo mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'secret'; FLUSH PRIVILEGES;"

    - echo "TANGO_HOST=127.0.0.1:10000" | sudo tee -a /etc/tangorc

  script:

    - cmake -B build -S . -G Ninja -DBUILD_TESTING=ON -DMYSQL_ADMIN=root -DMYSQL_ADMIN_PASSWD=secret

    - cmake -B build -S . -G Ninja -DBUILD_TESTING=ON -DMYSQL_ADMIN=root -DMYSQL_ADMIN_PASSWD=secret -DMYSQL_HOST="127.0.0.1"

    - cmake --build build

    - cd build

    - ctest --output-on-failure