From 5f158b4d91e9a93cf7cf6b30dde6ca3cd0052ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Tue, 21 Mar 2017 11:49:21 +0100
Subject: Update the ci to use the latest image, and remove deprecated jobs

---
 .gitlab-ci.yml | 32 +++++---------------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd32742..e36ea0e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ variables:
   tags:
     - docker
 
-image: biboumi-test-fedora:latest
+image: docker.louiz.org/biboumi-test-fedora:latest
 
 build:1:
   variables:
@@ -72,7 +72,7 @@ build:6:
 
 build:rpm:
   stage: build
-  image: biboumi-test-fedora:latest
+  image: docker.louiz.org/biboumi-test-fedora:latest
   tags:
     - docker
   script:
@@ -104,33 +104,21 @@ build:rpm:
 
 test:debian:
   stage: test
-  image: biboumi-test-debian:latest
+  image: docker.louiz.org/biboumi-test-debian:latest
   tags:
     - docker
   <<: *basic_test
 
 test:fedora:
   stage: test
-  image: biboumi-test-fedora:latest
+  image: docker.louiz.org/biboumi-test-fedora:latest
   tags:
     - docker
   <<: *basic_test
 
-test:openbsd:
-  variables:
-    COMPILER: "g++"
-    SYSTEMD: "-DWITHOUT_SYSTEMD=1"
-  stage: test
-  script:
-    - cmake .. -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${CARES} ${SYSTEMD} ${LIBIDN} ${LITESQL}
-    - make biboumi
-    - make check
-  tags:
-    - openbsd
-
 test:coverity:
   stage: test
-  image: biboumi-test-fedora:latest
+  image: docker.louiz.org/biboumi-test-fedora:latest
   allow_failure: true
   when: manual
   script:
@@ -139,13 +127,3 @@ test:coverity:
     - cov-build --dir cov-int   make biboumi test_suite -j$(nproc || echo 1)
     - tar czvf biboumi_coverity.tgz cov-int
     - curl --form token=$COVERITY_TOKEN   --form email=louiz@louiz.org   --form file=@biboumi_coverity.tgz  --form version="$(git rev-parse --short HEAD)" --form description="Automatic submission by gitlab-ci" https://scan.coverity.com/builds?project=louiz%2Fbiboumi
-
-test:sonar-qube:
-  stage: test
-  image: biboumi-test-fedora:latest
-  script:
-    - cmake ..
-    - ~/sonar-scanner/bin/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir ./bw-outputs make biboumi test_suite
-    - cd ..
-    - ~/sonar-scanner/bin/sonar-scanner -Dsonar.host.url=https://sonarqube.com -Dsonar.login=$SONAR_LOGIN -Dsonar.language=cpp -Dsonar.cfamily.build-wrapper-output=build/bw-outputs -Dsonar.sourceEncoding=UTF-8 -Dsonar.sources=src/,louloulibs/,tests/ -Dsonar.projectKey=biboumi -Dsonar.projectName=Biboumi -Dsonar.projectVersion=3.0
-
-- 
cgit v1.2.3