[Git][NTPsec/ntpsec][master] Remove "entrypoint" hacks from CI definitions

[Matt Selsky (@selsky)]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
c9c7f716 by Matt Selsky at 2023-04-27T00:48:46-04:00
Remove "entrypoint" hacks from CI definitions

The real fix was likey eff644a4262ef1eb0d78a8958cc59b33b0541d57 ("Use latest
docker image when building docker images")

- - - - -


2 changed files:

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


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -64,9 +64,7 @@ alpine-edge-refclocks:
 
 AsciiDoc-3-Fedora:
   <<: *job_definition_allow_failure
-  image:
-    name: fedora
-    entrypoint: [ '/bin/bash', '-c' ]
+  image: fedora
   script:
     - yum -y install bison gcc openssl-devel libcap-devel pps-tools-devel python3-devel wget libxslt docbook-style-xsl
     - mkdir asciidoc3
@@ -179,9 +177,7 @@ ubuntu-latest-refclocks:
 
 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' ]
+  image: $CI_REGISTRY/ntpsec/ntpsec/ubuntu-devel
   script:
     - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3"
     - python3 ./waf install
@@ -189,9 +185,7 @@ ubuntu-devel-basic:
 
 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' ]
+  image: $CI_REGISTRY/ntpsec/ntpsec/ubuntu-devel
   script:
     - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
 
@@ -247,9 +241,7 @@ centos-latest-refclocks:
 
 fedora-latest-basic:
   <<: *job_definition
-  image:
-    name: $CI_REGISTRY/ntpsec/ntpsec/fedora-latest
-    entrypoint: [ '/bin/bash', '-c' ]
+  image: $CI_REGISTRY/ntpsec/ntpsec/fedora-latest
   script:
     - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3"
     - python3 ./waf install
@@ -257,9 +249,7 @@ fedora-latest-basic:
 
 fedora-latest-refclocks:
   <<: *job_definition
-  image:
-    name: $CI_REGISTRY/ntpsec/ntpsec/fedora-latest
-    entrypoint: [ '/bin/bash', '-c' ]
+  image: $CI_REGISTRY/ntpsec/ntpsec/fedora-latest
   script:
     - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
 


=====================================
.gitlab-opttest-ci.yml
=====================================
@@ -52,9 +52,7 @@ centos-options-tester:
     - dnf -y --enablerepo=crb install bison gcc openssl-devel libcap-devel python3-devel pps-tools-devel libseccomp-devel bash
 
 fedora-latest-options-tester:
-  image:
-    name: fedora:latest
-    entrypoint: [ '/bin/bash', '-c', 'ln -snf /bin/bash /bin/sh && /bin/bash -c $0' ]
+  image: fedora:latest
   script:
     - yum -y install bison gcc openssl-devel libcap-devel pps-tools-devel python3-devel python2-devel libseccomp-devel bash
   <<: *option_tester
@@ -161,13 +159,9 @@ ubuntu-latest-options-tester:
   <<: *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']
+  image: ubuntu:devel
   <<: *deb_option_tester_py3_only
 
 ubuntu-rolling-options-tester:
-  image:
-    name: ubuntu:rolling
-    entrypoint: [ '/bin/sh', '-c', 'ln -snf /bin/bash /bin/sh && /bin/bash -c $0']
+  image: ubuntu:rolling
   <<: *deb_option_tester_py3_only



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

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/c9c7f716e12063e96fd5624f6dd481daff16b98a
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/20230427/896b4088/attachment-0001.htm>