[Git][NTPsec/ntpsec][master] CI: shuffle asciidoc classic and py3 jobs to where they will run right ...

[James Browning (@jamesb_fe80)]

James Browning pushed to branch master at NTPsec / ntpsec


Commits:
ea8b172e by James Browning at 2021-03-02T11:48:57-08:00
CI: shuffle asciidoc classic and py3 jobs to where they will run right ...

The job that was used to run the asciidoc py3 test got stuck installing
tex of all things and the jobs that were used to run asciidoc classic
tests had silently shifted to py3.

Move the classic jobs to Debian oldstable where the will run for a
while correctly and move the py3 job to AlpineLinux where it does
not have to worry about tex. Also, exploit our docker images for a
small speed boost.

- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -76,12 +76,12 @@ AsciiDoc-3-Fedora:
     - asciidoc3/asciidoc3 --version || echo -n
     - PATH="$PWD/asciidoc3:$PATH" python3 ./waf configure --enable-doc --enable-manpage build
 
-AsciiDoc-classic2-Alpine:
+AsciiDoc-py3-Alpine:
   <<: *job_definition
-  image: alpine
+  image: $CI_REGISTRY/ntpsec/ntpsec/alpine
   script:
-    - apk update && apk add gcc bison musl-dev openssl-dev libcap-dev python2-dev asciidoc
-    - python ./waf configure --enable-doc --enable-manpage build
+    - apk update && apk add python3-dev asciidoc
+    - python3 ./waf configure --enable-doc --enable-manpage build
 
 AsciiDoc-classic3-Alpine:
   <<: *job_definition
@@ -97,13 +97,21 @@ AsciiDoc-no:
     - apk update && apk add gcc bison musl-dev openssl-dev libcap-dev python2-dev
     - python ./waf configure --disable-doc --disable-manpage build
 
-AsciiDoc-py3-Ubuntu:
+AsciiDoc-classic3-Debian-Old:
   <<: *job_definition
-  image: ubuntu:devel
+  image: $CI_REGISTRY/ntpsec/ntpsec/debian-oldstable
   script:
     - apt-get update
-    - DEBIAN_FRONTEND="noninteractive" apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python3-dev asciidoc-base
-    - python3 ./waf configure --enable-doc --enable-manpage build
+    - DEBIAN_FRONTEND="noninteractive" apt-get install -y python3-dev asciidoc-base
+    - python3 ./waf configure --enable-doc --enable-manpage build --disable-nts
+
+AsciiDoc-classic2-Debian-Old:
+  <<: *job_definition
+  image: $CI_REGISTRY/ntpsec/ntpsec/debian-oldstable
+  script:
+    - apt-get update
+    - DEBIAN_FRONTEND="noninteractive" apt-get install -y python2.7-dev asciidoc-base
+    - python2 ./waf configure --enable-doc --enable-manpage build --disable-nts
 
 debian-oldstable-basic:
   <<: *job_definition



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

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/ea8b172e29b5d8331a60459dcbd48a4db664a2df
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/20210323/797a9c36/attachment-0001.htm>