Add a test in Dockerfile directly to check the version

Otherwise when a wrong stream is installed, it's only found by scl test, which is too late in the process and might even go through uncought, especially when the scl test is removed for non-SCL distros at some point.
sclorg · Nov 15, 2022 · cfb512e · cfb512e
1 parent b53e62c
commit cfb512e
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 1 deletion.
diff --git a/5.26-mod_fcgid/Dockerfile.rhel8 b/5.26-mod_fcgid/Dockerfile.rhel8
@@ -42,6 +42,7 @@ RUN INSTALL_PKGS="perl perl-devel mod_fcgid perl-App-cpanminus perl-FCGI patch"
     yum -y --allowerasing distrosync && \
     yum install -y --setopt=tsflags=nodocs  $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
+    perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \
     yum -y clean all --enablerepo='*'
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH

diff --git a/5.26/Dockerfile.fedora b/5.26/Dockerfile.fedora
@@ -36,6 +36,7 @@ LABEL summary="$SUMMARY" \
 RUN INSTALL_PKGS="perl perl-devel mod_perl perl-CPAN perl-App-cpanminus httpd python2" && \
     dnf install -y --setopt=tsflags=nodocs  $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
+    perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \
     dnf clean all
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH

diff --git a/5.30-mod_fcgid/Dockerfile.rhel8 b/5.30-mod_fcgid/Dockerfile.rhel8
@@ -42,6 +42,7 @@ RUN INSTALL_PKGS="perl perl-devel mod_fcgid perl-App-cpanminus perl-FCGI patch"
     yum -y --allowerasing distrosync && \
     yum install -y --setopt=tsflags=nodocs  $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
+    perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \
     yum -y clean all --enablerepo='*'
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH

diff --git a/5.30/Dockerfile.fedora b/5.30/Dockerfile.fedora
@@ -38,6 +38,7 @@ LABEL summary="$SUMMARY" \
 RUN INSTALL_PKGS="perl perl-devel mod_perl perl-CPAN perl-App-cpanminus httpd python2" && \
     dnf install -y --setopt=tsflags=nodocs  $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
+    perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \
     dnf clean all
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH

diff --git a/5.32/Dockerfile.c9s b/5.32/Dockerfile.c9s
@@ -39,6 +39,7 @@ RUN INSTALL_PKGS="perl perl-devel mod_fcgid perl-App-cpanminus perl-FCGI patch"
     yum -y --allowerasing distrosync && \
     yum install -y --setopt=tsflags=nodocs  $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
+    perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \
     yum -y clean all --enablerepo='*'
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH

diff --git a/5.32/Dockerfile.fedora b/5.32/Dockerfile.fedora
@@ -39,6 +39,7 @@ RUN INSTALL_PKGS="perl perl-devel mod_fcgid perl-App-cpanminus perl-FCGI patch"
     dnf -y module enable perl:$PERL_VERSION && \
     dnf install -y --setopt=tsflags=nodocs  $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
+    perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \
     dnf -y clean all --enablerepo='*'
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH

diff --git a/5.32/Dockerfile.rhel9 b/5.32/Dockerfile.rhel9
@@ -39,6 +39,7 @@ RUN INSTALL_PKGS="perl perl-devel mod_fcgid perl-App-cpanminus perl-FCGI patch"
     yum -y --allowerasing distrosync && \
     yum install -y --setopt=tsflags=nodocs  $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
+    perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \
     yum -y clean all --enablerepo='*'
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH

diff --git a/5.34/Dockerfile.c9s b/5.34/Dockerfile.c9s
@@ -39,6 +39,7 @@ RUN INSTALL_PKGS="perl perl-devel mod_fcgid perl-App-cpanminus perl-FCGI patch"
     yum -y --allowerasing distrosync && \
     yum install -y --setopt=tsflags=nodocs  $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
+    perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \
     yum -y clean all --enablerepo='*'
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH

diff --git a/5.34/Dockerfile.fedora b/5.34/Dockerfile.fedora
@@ -39,6 +39,7 @@ RUN INSTALL_PKGS="perl perl-devel mod_fcgid perl-App-cpanminus perl-FCGI patch"
     dnf -y module enable perl:$PERL_VERSION && \
     dnf install -y --setopt=tsflags=nodocs  $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
+    perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \
     dnf -y clean all --enablerepo='*'
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH

diff --git a/common b/common
+39 −55		.github/workflows/container-tests.yml
+0 −22		.github/workflows/differential-shellcheck.yml
+1 −1		.github/workflows/sanity-tests.yaml
+2 −1		.pre-commit-config.yaml
+5 −0		.travis.yml
+18 −12		Makefile
+6 −9		README.md
+4 −16		betka.py
+63 −17		build.sh
+8 −6		clean.sh
+18 −13		common.mk
+191 −0		generate.sh
+0 −202		generator.py
+0 −148		push_as_submodule.sh
+4 −54		shared-scripts/core/usr/bin/cgroup-limits
+25 −0		squash.py
+7 −1		tag.sh
+40 −102		test-lib-openshift.sh
+33 −49		test-lib-remote-openshift.sh
+8 −26		test-lib.sh
+2 −8		test-openshift.yaml
+0 −8		test.sh
+1 −2		tests/failures/check/Makefile
+0 −3		tests/failures/check/check_skip_squash.sh
+1 −0		tests/failures/check/common
+0 −2		tests/failures/check/v0/Dockerfile.rhel9
+61 −70		tests/remote-containers.sh
+1 −0		tests/squash/.gitignore
+24 −0		tests/squash/squash.sh
+1 −1		tests/test-lib/image_availability
+0 −36		tests/test-lib/run_all_tests