.dockerfiles/debian-stable-i386

@@ -5,4 +5,4 @@
 FROM i386/debian:stable-slim
 
 RUN apt-get update
-RUN apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python-dev libbsd-dev
+RUN apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python3-dev libbsd-dev

.dockerfiles/debian-stable-mdns

@@ -5,4 +5,4 @@
 FROM debian:stable-slim
 
 RUN apt-get update
-RUN apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python-dev libbsd-dev libavahi-compat-libdnssd-dev
+RUN apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python3-dev libbsd-dev libavahi-compat-libdnssd-dev

.gitlab-ci.yml

@@ -34,6 +34,11 @@ include:
   <<: *job_definition
   allow_failure: true
 
+.macos_saas_runners:
+  tags:
+    - saas-macos-medium-m1
+  image: macos-12-xcode-14
+
 alpine-basic:
   <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/alpine
@@ -371,7 +376,8 @@ coverity-scan:
 
 macos-basic:
   <<: *job_definition
-  image: macos-12-xcode-14
+  extends:
+    - .macos_saas_runners
   script:
     - PKG_CONFIG_PATH=${HOMEBREW_PREFIX}/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3"
     - DESTDIR=build/prison python ./waf install
@@ -380,18 +386,15 @@ macos-basic:
     - sudo python ./waf install
     - sudo python ./waf uninstall
     - rm -rvf build/prison ./prison ../prison
-  tags:
-    - saas-macos-medium-m1
   rules:
     - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
 
 macos-refclocks:
   <<: *job_definition
-  image: macos-12-xcode-14
+  extends:
+    - .macos_saas_runners
   script:
     - PKG_CONFIG_PATH=${HOMEBREW_PREFIX}/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage --refclock=all build || cat build/config.log
-  tags:
-    - saas-macos-medium-m1
   rules:
     - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
 

.gitlab-opttest-ci.yml

@@ -58,11 +58,11 @@ fedora-latest-options-tester:
   <<: *option_tester
 
 opensuse-leap-options-tester:
-  <<: *option_tester
+  <<: *option_tester_py3_only
   image: opensuse/leap
   allow_failure: true
   script:
-    - zypper -n install bison gcc libopenssl-devel libcap-devel pps-tools-devel python-devel python-curses libseccomp-devel python3-devel python3-curses bash
+    - zypper -n install bison gcc libopenssl-devel libcap-devel pps-tools-devel libseccomp-devel python3-devel python3-curses bash
 
 gentoo-options-tester:
   <<: *option_tester
@@ -125,7 +125,7 @@ freebsd-options-tester:
   needs: []
   script:
     - apt-get update
-    - apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python-dev python-minimal libseccomp-dev bash pkg-config python3-dev python3-minimal
+    - apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python2-dev python2-minimal libseccomp-dev bash pkg-config python3-dev python3-minimal
     - PYTHON=python bash tests/option-tester.sh
     - PYTHON=python3 bash tests/option-tester.sh
   tags:
@@ -135,7 +135,7 @@ freebsd-options-tester:
 
 debian-i386-options-tester:
   image: i386/debian:stable-slim
-  <<: *deb_option_tester
+  <<: *deb_option_tester_py3_only
 
 debian-oldstable-options-tester:
   image: debian:oldstable-slim
@@ -143,7 +143,7 @@ debian-oldstable-options-tester:
 
 debian-stable-options-tester:
   image: debian:stable-slim
-  <<: *deb_option_tester
+  <<: *deb_option_tester_py3_only
 
 debian-testing-options-tester:
   image: debian:testing-slim