Fix: TEST starts to remove python2 stuff

naparuba · Sep 14, 2024 · 76a7fa3 · 76a7fa3
1 parent 151ba9f
commit 76a7fa3
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 154 deletions.
diff --git a/.../docker-files/TEMPLATE-alpine-PYTHON3.txt → test/docker-files/TEMPLATE-alpine.txt b/.../docker-files/TEMPLATE-alpine-PYTHON3.txt → test/docker-files/TEMPLATE-alpine.txt
@@ -1,7 +1,7 @@
-FROM       alpine:3.16
+FROM       alpine:3.20
 LABEL maintainer="Jean Gabes <[email protected]>"
 
-# THIS DOCKER FILE is USED TO PUSH TO naparuba/alpine-PYTHON3 so tests will be faster, and won't need to recompute all of this every time
+# THIS DOCKER FILE is USED TO PUSH TO naparuba/alpine so tests will be faster, and won't need to recompute all of this every time
 
 ADD        test/docker-helper/  /
 RUN        /apk_add bash

diff --git a/test/docker-files/docker-file-COMPLIANCE-FILE-RIGHTS-NO-ENV.txt b/test/docker-files/docker-file-COMPLIANCE-FILE-RIGHTS-NO-ENV.txt
@@ -1,4 +1,4 @@
-FROM       naparuba/debian-10
+FROM       naparuba/debian-12
 LABEL maintainer="Jean Gabes <[email protected]>"
 
 

diff --git a/test/docker-files/docker-file-COMPLIANCE-FILE-RIGHTS-PYTHON3.txt b/test/docker-files/docker-file-COMPLIANCE-FILE-RIGHTS-PYTHON3.txt
diff --git a/test/docker-files/docker-file-COMPLIANCE-FILE-RIGHTS.txt b/test/docker-files/docker-file-COMPLIANCE-FILE-RIGHTS.txt
@@ -1,4 +1,4 @@
-FROM       naparuba/debian-10
+FROM       naparuba/debian-12
 LABEL maintainer="Jean Gabes <[email protected]>"
 
 

diff --git a/test/docker-files/docker-file-COMPLIANCE-GET-URL-PYTHON3.txt b/test/docker-files/docker-file-COMPLIANCE-GET-URL-PYTHON3.txt
diff --git a/...ocker-file-COMPLIANCE-GET-URL-PYTHON2.txt → ...-files/docker-file-COMPLIANCE-GET-URL.txt b/...ocker-file-COMPLIANCE-GET-URL-PYTHON2.txt → ...-files/docker-file-COMPLIANCE-GET-URL.txt
@@ -1,10 +1,9 @@
-FROM       naparuba/debian-10
+FROM       naparuba/debian-12
 LABEL maintainer="Jean Gabes <[email protected]>"
 
 
 RUN        /apt_get_install   procps
 
-
 ADD        . /root/opsbro-oss
 WORKDIR    /root/opsbro-oss
 

diff --git a/test/docker-files/docker-file-COMPLIANCE-MULTI-PYTHON3.txt b/test/docker-files/docker-file-COMPLIANCE-MULTI-PYTHON3.txt
diff --git a/test/docker-files/docker-file-COMPLIANCE-MULTI.txt b/test/docker-files/docker-file-COMPLIANCE-MULTI.txt
@@ -1,4 +1,4 @@
-FROM       naparuba/debian-10
+FROM       naparuba/debian-12
 LABEL maintainer="Jean Gabes <[email protected]>"
 
 

diff --git a/...e-COMPLIANCE-PACKAGE-INSTALL-fedora28.txt → ...e-COMPLIANCE-PACKAGE-INSTALL-fedora42.txt b/...e-COMPLIANCE-PACKAGE-INSTALL-fedora28.txt → ...e-COMPLIANCE-PACKAGE-INSTALL-fedora42.txt
@@ -1,8 +1,8 @@
-FROM       fedora:28
+FROM       fedora:42
 LABEL maintainer="Jean Gabes <[email protected]>"
 
 ADD        test/docker-helper/  /
-RUN        /dnf_install python2
+RUN        /dnf_install python3
 
 # Need for debug and test
 RUN        /dnf_install   procps
@@ -13,7 +13,7 @@ ADD        . /root/opsbro-oss
 
 WORKDIR    /root/opsbro-oss
 
-RUN        python setup.py install
+RUN        python3 setup.py install
 
 # Copy the mail pack into a local one to enable modification
 RUN        opsbro  packs overload global.nginx

diff --git a/test/docker-files/docker-file-FEDORA-installation-fedora-34.txt b/test/docker-files/docker-file-FEDORA-installation-fedora-34.txt
diff --git a/test/docker-files/docker-file-FEDORA-installation-fedora-35.txt b/test/docker-files/docker-file-FEDORA-installation-fedora-35.txt
diff --git a/test/docker-files/docker-file-FEDORA-installation-fedora-36.txt b/test/docker-files/docker-file-FEDORA-installation-fedora-36.txt
diff --git a/test/docker-files/docker-file-MODULE-dns-module-debian10.txt b/test/docker-files/docker-file-MODULE-dns-module-debian10.txt
diff --git a/test/docker-files/docker-file-MODULE-dns-module-debian11.txt b/test/docker-files/docker-file-MODULE-dns-module-debian11.txt
@@ -1,6 +1,4 @@
-# By default we are testing the python2 version, and the builder can ask for python3 with "-python3"
-ARG        MY_PYTHON_VERSION=
-FROM       naparuba/debian-11$MY_PYTHON_VERSION
+FROM       naparuba/debian-11
 LABEL maintainer="Jean Gabes <[email protected]>"
 
 

diff --git a/...docker-file-MODULE-dns-module-debian9.txt → ...ocker-file-MODULE-dns-module-debian12.txt b/...docker-file-MODULE-dns-module-debian9.txt → ...ocker-file-MODULE-dns-module-debian12.txt
@@ -1,6 +1,4 @@
-# By default we are testing the python2 version, and the builder can ask for python3 with "-python3"
-ARG        MY_PYTHON_VERSION=
-FROM       naparuba/debian-9$MY_PYTHON_VERSION
+FROM       naparuba/debian-12
 LABEL maintainer="Jean Gabes <[email protected]>"
 
 

diff --git a/test/docker-files/docker-file-OTHER-debian10-test-python.txt b/test/docker-files/docker-file-OTHER-debian10-test-python.txt
diff --git a/...le-OTHER-debian11-test-python-PYTHON3.txt → ...ocker-file-OTHER-debian11-test-python.txt b/...le-OTHER-debian11-test-python-PYTHON3.txt → ...ocker-file-OTHER-debian11-test-python.txt
@@ -1,4 +1,4 @@
-FROM       naparuba/debian-11-python3
+FROM       naparuba/debian-12
 LABEL maintainer="Jean Gabes <[email protected]>"