[Git][NTPsec/ntpsec][master] Use "waf check" in Gitlab CI jobs

[Matt Selsky]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
f8a1b8d3 by Matt Selsky at 2017-12-25T12:10:14-05:00
Use "waf check" in Gitlab CI jobs

Now that waf check also runs python tests, use it, instead of explicitly
calling unittests directly.

- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,8 +54,7 @@ gitlab-basic:
   <<: *job_definition
   script:
     - apt-get update -qq && apt-get install -y -qq bison libcap-dev pps-tools python-dev
-    - python ./waf configure build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure build check
   tags:
     - gitlab-org
 
@@ -63,104 +62,91 @@ gitlab-refclocks:
   <<: *job_definition
   script:
     - apt-get update -qq && apt-get install -y -qq bison libcap-dev pps-tools python-dev
-    - python ./waf configure --refclock=all build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure --refclock=all build check
   tags:
     - gitlab-org
 
 debian-wheezy-basic:
   <<: *job_definition
   script:
-    - python ./waf configure build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure build check
   tags:
     - debian-wheezy
 
 debian-wheezy-refclocks:
   <<: *job_definition
   script:
-    - python ./waf configure --refclock=all build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure --refclock=all build check
   tags:
     - debian-wheezy
 
 debian-jessie-basic:
   <<: *job_definition
   script:
-    - python ./waf configure build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure build check
   tags:
     - debian-jessie
 
 debian-jessie-refclocks:
   <<: *job_definition
   script:
-    - python ./waf configure --refclock=all build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure --refclock=all build check
   tags:
     - debian-jessie
 
 debian-stretch-basic:
   <<: *job_definition
   script:
-    - python ./waf configure build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure build check
   tags:
     - debian-stretch
 
 debian-stretch-refclocks:
   <<: *job_definition
   script:
-    - python ./waf configure --refclock=all build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure --refclock=all build check
   tags:
     - debian-stretch
 
 ubuntu-1404-lts-basic:
   <<: *job_definition
   script:
-    - python ./waf configure build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure build check
   tags:
     - ubuntu-1404-lts
 
 ubuntu-1404-lts-refclocks:
   <<: *job_definition
   script:
-    - python ./waf configure --refclock=all build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure --refclock=all build check
   tags:
     - ubuntu-1404-lts
 
 ubuntu-1604-lts-basic:
   <<: *job_definition
   script:
-    - python ./waf configure build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure build check
   tags:
     - ubuntu-1604-lts
 
 ubuntu-1604-lts-refclocks:
   <<: *job_definition
   script:
-    - python ./waf configure --refclock=all build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure --refclock=all build check
   tags:
     - ubuntu-1604-lts
 
 ubuntu-1710-basic:
   <<: *job_definition
   script:
-    - python ./waf configure build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure build check
   tags:
     - ubuntu-1710
 
 ubuntu-1710-refclocks:
   <<: *job_definition
   script:
-    - python ./waf configure --refclock=all build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure --refclock=all build check
   tags:
     - ubuntu-1710
 
@@ -169,8 +155,7 @@ gcc-7-basic:
   image: gcc:7
   script:
     - apt-get update -qq && apt-get install -y -qq bison libcap-dev pps-tools python-dev
-    - python ./waf configure build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure build check
   tags:
     - gitlab-org
 
@@ -179,102 +164,91 @@ gcc-7-refclocks:
   image: gcc:7
   script:
     - apt-get update -qq && apt-get install -y -qq bison libcap-dev pps-tools python-dev
-    - python ./waf configure --refclock=all build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure --refclock=all build check
   tags:
     - gitlab-org
 
 freebsd-10-basic:
   <<: *job_definition
   script:
-    - python ./waf configure build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure build check
   tags:
     - freebsd-10
 
 freebsd-10-refclocks:
   <<: *job_definition
   script:
-    - python ./waf configure --refclock=all build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure --refclock=all build check
   tags:
     - freebsd-10
 
 freebsd-11-basic:
   <<: *job_definition
   script:
-    - python ./waf configure build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure build check
   tags:
     - freebsd-11
 
 freebsd-11-refclocks:
   <<: *job_definition
   script:
-    - python ./waf configure --refclock=all build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure --refclock=all build check
   tags:
     - freebsd-11
 
 centos-6-basic:
   <<: *job_definition
   script:
-    - python ./waf configure build
+    - python ./waf configure build check
   tags:
     - centos-6
 
 centos-6-refclocks:
   <<: *job_definition
   script:
-    - python ./waf configure --refclock=all build
+    - python ./waf configure --refclock=all build check
   tags:
     - centos-6
 
 centos-7-basic:
   <<: *job_definition
   script:
-    - python ./waf configure build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure build check
   tags:
     - centos-7
 
 centos-7-refclocks:
   <<: *job_definition
   script:
-    - python ./waf configure --refclock=all build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure --refclock=all build check
   tags:
     - centos-7
 
 fedora-26-basic:
   <<: *job_definition
   script:
-    - python ./waf configure build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure build check
   tags:
     - fedora-26
 
 fedora-26-refclocks:
   <<: *job_definition
   script:
-    - python ./waf configure --refclock=all build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure --refclock=all build check
   tags:
     - fedora-26
 
 fedora-27-basic:
   <<: *job_definition
   script:
-    - python ./waf configure build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure build check
   tags:
     - fedora-27
 
 fedora-27-refclocks:
   <<: *job_definition
   script:
-    - python ./waf configure --refclock=all build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure --refclock=all build check
   tags:
     - fedora-27
 
@@ -283,8 +257,7 @@ python3:
   image: python:3
   script:
     - apt-get update -qq && apt-get install -y -qq bison libcap-dev pps-tools
-    - python ./waf configure --refclock=all build
-    - python -m unittest discover -s build/main/tests/pylib
+    - python ./waf configure --refclock=all build check
   tags:
     - gitlab-org
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/f8a1b8d3ea811d482ee5f5fafb125d5342438b2b

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/f8a1b8d3ea811d482ee5f5fafb125d5342438b2b
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20171225/94a7c8f5/attachment.html>