[Git][NTPsec/ntpsec][master] CI: apply gitlab-runner #27614 fix, mostly addresses #687 r3 ...

[James Browning (@jamesb_fe80)]

James Browning pushed to branch master at NTPsec / ntpsec


Commits:
1a8e2da3 by James Browning at 2021-05-12T09:10:12-07:00
CI: apply gitlab-runner #27614 fix, mostly addresses #687 r3 ...

Fix two and attempt third of fedora:latest runners
restore opensuse:tumbleweed, ubuntu:devel
fix an ubuntu:rolling job, the other is key related

- - - - -


2 changed files:

- .gitlab-ci.yml
- .gitlab-opttest-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -66,7 +66,9 @@ alpine-edge-refclocks:
 
 AsciiDoc-3-Fedora:
   <<: *job_definition_allow_failure
-  image: fedora
+  image:
+    name: fedora
+    entrypoint: [ '/bin/bash', '-c' ]
   script:
     - yum -y install bison gcc openssl-devel libcap-devel pps-tools-devel python3-devel wget unzip libxslt docbook-style-xsl
     - wget https://asciidoc3.org/asciidoc3-3.2.0.zip
@@ -176,6 +178,24 @@ ubuntu-latest-refclocks:
   script:
     - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
 
+ubuntu-devel-basic:
+  <<: *job_definition_allow_failure
+  image:
+    name: $CI_REGISTRY/ntpsec/ntpsec/ubuntu-devel
+    entrypoint: [ '/bin/bash', '-c', 'ln -snf /bin/bash /bin/sh && /bin/bash -c $0' ]
+  script:
+    - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3"
+    - python3 ./waf install
+    - python3 ./waf uninstall
+
+ubuntu-devel-refclocks:
+  <<: *job_definition_allow_failure
+  image:
+    name: $CI_REGISTRY/ntpsec/ntpsec/ubuntu-devel
+    entrypoint: [ '/bin/bash', '-c', 'ln -snf /bin/bash /bin/sh && /bin/bash -c $0' ]
+  script:
+    - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
+
 ubuntu-rolling-basic:
   <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/ubuntu-rolling
@@ -250,7 +270,9 @@ centos-latest-refclocks:
 
 fedora-latest-basic:
   <<: *job_definition
-  image: $CI_REGISTRY/ntpsec/ntpsec/fedora-latest
+  image:
+    name: $CI_REGISTRY/ntpsec/ntpsec/fedora-latest
+    entrypoint: [ '/bin/bash', '-c' ]
   script:
     - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3"
     - python3 ./waf install
@@ -258,7 +280,9 @@ fedora-latest-basic:
 
 fedora-latest-refclocks:
   <<: *job_definition
-  image: $CI_REGISTRY/ntpsec/ntpsec/fedora-latest
+  image:
+    name: $CI_REGISTRY/ntpsec/ntpsec/fedora-latest
+    entrypoint: [ '/bin/bash', '-c' ]
   script:
     - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
 
@@ -304,6 +328,24 @@ openSUSE-leap-refclocks:
   script:
     - python3 ./waf configure --disable-doc --disable-manpage --disable-nts --refclock=all build
 
+openSUSE-tumbleweed-basic:
+  <<: *job_definition_allow_failure
+  image:
+    name: $CI_REGISTRY/ntpsec/ntpsec/opensuse-tumbleweed
+    entrypoint: [ '/bin/bash', '-c' ]
+  script:
+    - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3"
+    - python3 ./waf install
+    - python3 ./waf uninstall
+
+openSUSE-tumbleweed-refclocks:
+  <<: *job_definition_allow_failure
+  image:
+    name: $CI_REGISTRY/ntpsec/ntpsec/opensuse-tumbleweed
+    entrypoint: [ '/bin/bash', '-c' ]
+  script:
+    - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
+
 debian-stable-basic-32bit:
   <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/debian-stable-i386


=====================================
.gitlab-opttest-ci.yml
=====================================
@@ -28,7 +28,9 @@ centos-options-tester:
     - dnf -y --enablerepo=powertools install bison gcc openssl-devel libcap-devel python3-devel python2-devel pps-tools-devel libseccomp-devel bash
 
 fedora-latest-options-tester:
-  image: fedora:latest
+  image:
+    name: fedora:latest
+    entrypoint: [ '/bin/bash', '-c', 'ln -snf /bin/bash /bin/sh && /bin/bash -c $0' ]
   script:
     - yum -y install bison gcc openssl-devel libcap-devel pps-tools-devel python3-devel python2-devel libseccomp-devel bash
   <<: *option_tester
@@ -141,6 +143,14 @@ ubuntu-latest-options-tester:
   image: ubuntu:latest
   <<: *deb_option_tester
 
+ubuntu-devel-options-tester:
+  image:
+    name: ubuntu:devel
+    entrypoint: [ '/bin/sh', '-c', 'ln -snf /bin/bash /bin/sh && /bin/bash -c $0']
+  <<: *deb_option_tester
+
 ubuntu-rolling-options-tester:
-  image: ubuntu:rolling
+  image:
+    name: ubuntu:rolling
+    entrypoint: [ '/bin/sh', '-c', 'ln -snf /bin/bash /bin/sh && /bin/bash -c $0']
   <<: *deb_option_tester



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

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/1a8e2da372ab54d7a668f9c0d3eb63d59b7a37c5
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/20210513/9521065c/attachment-0001.htm>