gitlab ci: Use new CentOS 7 dockerfile based containers everywhere

1 files changed, 24 insertions, 55 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c46e954..759d583 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,12 @@
-image: registry.freedesktop.org/libnice/libnice/build-tools:centos-7
 stages:
  - build
  - test
 
 build autotools:
  stage: build
+ image: registry.freedesktop.org/ocrete/libnice/centos7/autotools-build
  except:
   - schedules
- before_script:
-  - yum install -y net-tools
  script:
   - ifconfig
   - export BUILD_ID="libnice-$CI_JOB_NAME_$CI_COMMIT_SHA-$CI_JOB_ID"
@@ -23,12 +21,11 @@ build autotools:
 
 test autotools:
   stage: test
+  image: registry.freedesktop.org/ocrete/libnice/centos7/autotools-build
   except:
     - schedules
   dependencies:
     - build autotools
-  before_script:
-   - yum install -y net-tools
   script:
     - ifconfig
     - make check
@@ -44,12 +41,11 @@ test autotools:
 
 distcheck autotools:
   stage: test
+  image: registry.freedesktop.org/ocrete/libnice/centos7/autotools-build
   except:
     - schedules
   dependencies:
     - build autotools
-  before_script:
-   - yum install -y net-tools
   script:
     - ifconfig
     - make distcheck
@@ -58,57 +54,35 @@ distcheck autotools:
       - libnice-*.tar.gz
 
 build meson:
-  image: 'fedora'
   stage: build
+  image: registry.freedesktop.org/ocrete/libnice/centos7/meson-build
   variables:
     PREFIX: "${CI_PROJECT_DIR}/libnice-prefix"
-    DEPENDENCIES: >
-      meson
-      gnutls-devel
-      gupnp-igd-devel
-      glib2-devel
-      gobject-introspection-devel
-      gstreamer1-devel
-      redhat-rpm-config
-      gtk-doc
   except:
     - schedules
   before_script:
-    - dnf install -y ${DEPENDENCIES}
     - mkdir -p "${CI_PROJECT_DIR}"
   script:
+    ## && true to make gitlab-ci happy
+    - source scl_source enable rh-python36 && true
     - meson --werror --warnlevel 2 -Dgtk_doc=enabled --prefix=$PREFIX build/
-    - ninja -C build/
+    - ninja-build -C build/
   artifacts:
     paths:
       - build/
 
 test meson:
-  image: 'fedora'
   stage: test
+  image: registry.freedesktop.org/ocrete/libnice/centos7/meson-build
   allow_failure: true
   dependencies:
     - build meson
   except:
     - schedules
-  variables:
-   PREFIX: "${CI_PROJECT_DIR}/libnice-prefix"
-   DEPENDENCIES: >
-     meson
-     net-tools
-     gnutls-devel
-     gupnp-igd-devel
-     glib2-devel
-     gobject-introspection-devel
-     gstreamer1-devel
-     redhat-rpm-config
-      gtk-doc
-  before_script:
-    - dnf install -y ${DEPENDENCIES}
-    - mkdir -p "${CI_PROJECT_DIR}"
   script:
     - ifconfig
-    - meson test -C build --print-errorlogs
+    - source scl_source enable rh-python36 && true
+    - meson test -C build/ --print-errorlogs
   artifacts:
     when: on_failure
     paths:
@@ -116,43 +90,38 @@ test meson:
 
 doc-and-install meson:
   stage: test
-  image: fedora
+  image: registry.freedesktop.org/ocrete/libnice/centos7/meson-build
   dependencies:
     - build meson
   except:
     - schedules
   variables:
     PREFIX: "${CI_PROJECT_DIR}/libnice-prefix"
-    DEPENDENCIES: >
-     meson
-     net-tools
-     gnutls-devel
-     gupnp-igd-devel
-     glib2-devel
-     gobject-introspection-devel
-     gstreamer1-devel
-     redhat-rpm-config
-     gtk-doc
-  before_script:
-    - dnf install -y ${DEPENDENCIES}
-    - mkdir -p "${CI_PROJECT_DIR}"
   script:
-    - ninja -C build libnice-doc
-    - ninja -C build/ install
+    - source scl_source enable rh-python36 && true
+    - ninja-build -C build/ libnice-doc
+    - ninja-build -C build/ install
     - ls -lR ${PREFIX}
   artifacts:
     paths:
       - build/docs/reference/libnice/html/
 
 submit-to-coverity:
- image: registry.freedesktop.org/libnice/libnice/build-tools/coverity:2017.07
- stage: build
+ stage: test
+ image: registry.freedesktop.org/ocrete/libnice/centos7/autotools-build
+ variables:
+   COVERITY_PROJECT: libnice
  only:
   - schedules
+  
+ dependencies: []
  script:
+  - curl -v https://scan.coverity.com/download/linux64  -o coverity_tool.tgz  --form token="${COVERITY_TOKEN}" --form project="${COVERITY_PROJECT}" && tar xf coverity_tool.tgz && rm coverity_tool.tgz
+  - mv cov-analysis-linux64-* cov-analysis-linux64
   - ./autogen.sh --prefix="$PREFIX" --disable-gtk-doc --disable-introspection
   - make clean
-  - export PATH="$PATH:/root/cov-analysis-linux64-2017.07/bin"
+  - export PATH="$PATH:${CI_PROJECT_DIR}/cov-analysis-linux64/bin"
+  - echo $PATH
   - cov-build --dir cov-int make -j4
   - tar czvf libnice.tgz cov-int
   - curl --form token=$COVERITY_TOKEN --form email=olivier.crete@ocrete.ca --form file=@libnice.tgz --form version="${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}" --form description="CI weekly run" https://scan.coverity.com/builds?project=libnice