From 5b075af37519d28b9e4509886f89fe332497e83c Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Apr 14 2023 17:11:24 +0000
Subject: git_sort: tests: Move docker files into one directory


Also accept build parameters like -q or --no-cache in run_all.sh

---

diff --git a/scripts/git_sort/tests/Docker/opensuse-15.4.Dockerfile b/scripts/git_sort/tests/Docker/opensuse-15.4.Dockerfile
new file mode 100644
index 0000000..1d5cbc7
--- /dev/null
+++ b/scripts/git_sort/tests/Docker/opensuse-15.4.Dockerfile
@@ -0,0 +1,24 @@
+# https://hub.docker.com/r/opensuse/leap/
+FROM opensuse/leap:15.4 AS base
+
+RUN zypper -n ref
+
+FROM base AS packages
+
+RUN zypper -n in git python3 python3-dbm rcs
+
+RUN git config --global user.email "you@example.com"
+RUN git config --global user.name "Your Name"
+
+COPY Kernel.gpg /tmp
+RUN rpmkeys --import /tmp/Kernel.gpg
+RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/SLE_15_SP4/Kernel:tools.repo
+RUN zypper -n in python3-pygit2 quilt
+
+FROM packages
+
+VOLUME /scripts
+
+WORKDIR /scripts/git_sort
+
+CMD python3 -m unittest discover -v
diff --git a/scripts/git_sort/tests/Docker/opensuse-tumbleweed.Dockerfile b/scripts/git_sort/tests/Docker/opensuse-tumbleweed.Dockerfile
new file mode 100644
index 0000000..af6cfbc
--- /dev/null
+++ b/scripts/git_sort/tests/Docker/opensuse-tumbleweed.Dockerfile
@@ -0,0 +1,24 @@
+# https://hub.docker.com/r/opensuse/tumbleweed/
+FROM opensuse/tumbleweed AS base
+
+RUN zypper -n ref
+
+FROM base AS packages
+
+RUN zypper -n in git python3 python3-dbm python3-pygit2 rcs util-linux
+
+RUN git config --global user.email "you@example.com"
+RUN git config --global user.name "Your Name"
+
+COPY Kernel.gpg /tmp
+RUN rpmkeys --import /tmp/Kernel.gpg
+RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/openSUSE_Factory/Kernel:tools.repo
+RUN zypper -n in --from Kernel_tools quilt
+
+FROM packages
+
+VOLUME /scripts
+
+WORKDIR /scripts/git_sort
+
+CMD python3 -m unittest discover -v
diff --git a/scripts/git_sort/tests/Docker/sle12-sp4.Dockerfile b/scripts/git_sort/tests/Docker/sle12-sp4.Dockerfile
new file mode 100644
index 0000000..49d8f9c
--- /dev/null
+++ b/scripts/git_sort/tests/Docker/sle12-sp4.Dockerfile
@@ -0,0 +1,33 @@
+# http://registry.suse.de/
+FROM registry.suse.de/suse/containers/sle-server/12-sp4/containers/suse/sles12sp4:latest AS base
+
+RUN rpm -e container-suseconnect
+RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-12:/GA/standard/SUSE:SLE-12:GA.repo
+RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-12:/Update/standard/SUSE:SLE-12:Update.repo
+RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD1/ DVD1
+RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD2/ DVD2
+RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD3/ DVD3
+# RUN zypper -n ar -G http://updates.suse.de/SUSE/Products/SLE-SDK/12-SP4/$(rpm -E %_arch)/product/ SDK
+RUN zypper -n ar http://download.suse.de/update/build.suse.de/SUSE/Updates/SLE-SERVER/12-SP4/$(rpm -E %_arch)/update/SUSE:Updates:SLE-SERVER:12-SP4:$(rpm -E %_arch).repo
+
+RUN zypper -n ref
+
+FROM base AS packages
+
+RUN zypper -n in git-core python3 python3-dbm rcs
+
+RUN git config --global user.email "you@example.com"
+RUN git config --global user.name "Your Name"
+
+COPY Kernel.gpg /tmp
+RUN rpmkeys --import /tmp/Kernel.gpg
+RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/SLE_12_SP4/Kernel:tools.repo
+RUN zypper -n in python3-pygit2 quilt
+
+FROM packages
+
+VOLUME /scripts
+
+WORKDIR /scripts/git_sort
+
+CMD python3 -m unittest discover -v
diff --git a/scripts/git_sort/tests/Docker/sle12-sp5.Dockerfile b/scripts/git_sort/tests/Docker/sle12-sp5.Dockerfile
new file mode 100644
index 0000000..f5e2f58
--- /dev/null
+++ b/scripts/git_sort/tests/Docker/sle12-sp5.Dockerfile
@@ -0,0 +1,33 @@
+# http://registry.suse.de/
+FROM registry.suse.de/suse/containers/sle-server/12-sp5/containers/suse/sles12sp5:latest AS base
+
+RUN rpm -e container-suseconnect
+RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-12:/GA/standard/SUSE:SLE-12:GA.repo
+RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-12:/Update/standard/SUSE:SLE-12:Update.repo
+RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD1/ DVD1
+RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD2/ DVD2
+RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD3/ DVD3
+# RUN zypper -n ar -G http://updates.suse.de/SUSE/Products/SLE-SDK/12-SP5/$(rpm -E %_arch)/product/ SDK
+RUN zypper -n ar http://download.suse.de/update/build.suse.de/SUSE/Updates/SLE-SERVER/12-SP5/$(rpm -E %_arch)/update/SUSE:Updates:SLE-SERVER:12-SP5:$(rpm -E %_arch).repo
+
+RUN zypper -n ref
+
+FROM base AS packages
+
+RUN zypper -n in git-core python3 python3-dbm rcs
+
+RUN git config --global user.email "you@example.com"
+RUN git config --global user.name "Your Name"
+
+COPY Kernel.gpg /tmp
+RUN rpmkeys --import /tmp/Kernel.gpg
+RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/SLE_12_SP5/Kernel:tools.repo
+RUN zypper -n in python3-pygit2 quilt
+
+FROM packages
+
+VOLUME /scripts
+
+WORKDIR /scripts/git_sort
+
+CMD python3 -m unittest discover -v
diff --git a/scripts/git_sort/tests/Docker/sle15.Dockerfile b/scripts/git_sort/tests/Docker/sle15.Dockerfile
new file mode 100644
index 0000000..4d1cc54
--- /dev/null
+++ b/scripts/git_sort/tests/Docker/sle15.Dockerfile
@@ -0,0 +1,27 @@
+# http://registry.suse.de/
+FROM registry.suse.de/suse/sle-15/update/images/suse/sle15:latest AS base
+
+RUN rpm -e container-suseconnect
+RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-15:/GA/standard/SUSE:SLE-15:GA.repo
+RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-15:/Update/standard/SUSE:SLE-15:Update.repo
+RUN zypper -n ref
+
+FROM base AS packages
+
+RUN zypper -n in git-core python3 python3-dbm rcs awk
+
+RUN git config --global user.email "you@example.com"
+RUN git config --global user.name "Your Name"
+
+COPY Kernel.gpg /tmp
+RUN rpmkeys --import /tmp/Kernel.gpg
+RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/SLE_15/Kernel:tools.repo
+RUN zypper -n in python3-pygit2 quilt
+
+FROM packages
+
+VOLUME /scripts
+
+WORKDIR /scripts/git_sort
+
+CMD python3 -m unittest discover -v
diff --git a/scripts/git_sort/tests/opensuse-15.4/Dockerfile b/scripts/git_sort/tests/opensuse-15.4/Dockerfile
deleted file mode 100644
index 1d5cbc7..0000000
--- a/scripts/git_sort/tests/opensuse-15.4/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# https://hub.docker.com/r/opensuse/leap/
-FROM opensuse/leap:15.4 AS base
-
-RUN zypper -n ref
-
-FROM base AS packages
-
-RUN zypper -n in git python3 python3-dbm rcs
-
-RUN git config --global user.email "you@example.com"
-RUN git config --global user.name "Your Name"
-
-COPY Kernel.gpg /tmp
-RUN rpmkeys --import /tmp/Kernel.gpg
-RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/SLE_15_SP4/Kernel:tools.repo
-RUN zypper -n in python3-pygit2 quilt
-
-FROM packages
-
-VOLUME /scripts
-
-WORKDIR /scripts/git_sort
-
-CMD python3 -m unittest discover -v
diff --git a/scripts/git_sort/tests/opensuse-tumbleweed/Dockerfile b/scripts/git_sort/tests/opensuse-tumbleweed/Dockerfile
deleted file mode 100644
index af6cfbc..0000000
--- a/scripts/git_sort/tests/opensuse-tumbleweed/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# https://hub.docker.com/r/opensuse/tumbleweed/
-FROM opensuse/tumbleweed AS base
-
-RUN zypper -n ref
-
-FROM base AS packages
-
-RUN zypper -n in git python3 python3-dbm python3-pygit2 rcs util-linux
-
-RUN git config --global user.email "you@example.com"
-RUN git config --global user.name "Your Name"
-
-COPY Kernel.gpg /tmp
-RUN rpmkeys --import /tmp/Kernel.gpg
-RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/openSUSE_Factory/Kernel:tools.repo
-RUN zypper -n in --from Kernel_tools quilt
-
-FROM packages
-
-VOLUME /scripts
-
-WORKDIR /scripts/git_sort
-
-CMD python3 -m unittest discover -v
diff --git a/scripts/git_sort/tests/run_all.sh b/scripts/git_sort/tests/run_all.sh
index f63ab5b..e0109b1 100755
--- a/scripts/git_sort/tests/run_all.sh
+++ b/scripts/git_sort/tests/run_all.sh
@@ -1,6 +1,28 @@
-#!/bin/bash
+#!/bin/sh
 
-libdir=$(dirname "$(readlink -f "$0")")
+enable_x() {
+	local enable=true
+	while [ $# -gt 0 ] ; do
+		{ [ "$1" = "-q" ] || [ "$1" = "--quiet" ] ; } && enable=false
+		shift
+	done
+	$enable && set -x
+	}
+
+enable_x "$@"
+
+testdir=$(dirname "$(readlink -f "$0")")
+keys="Kernel.gpg"
+
+for key in $keys ; do
+	cp -a $testdir/../../lib/SUSE/$key $testdir/Docker
+done
+
+trap '
+for key in $keys ; do
+	rm $testdir/Docker/$key
+done
+' EXIT
 
 for release in \
 	sle12-sp4 \
@@ -10,14 +32,12 @@ for release in \
 	opensuse-tumbleweed \
 	; do
 	echo "Building container image for $release..."
-	cp -a $libdir/../../lib/SUSE/Kernel.gpg $libdir/$release
-	docker build -q -t gs-test-$release "$libdir/$release"
+	docker build "$@" -t gs-test-$release -f $testdir/Docker/$release.Dockerfile --build-arg release=$release $testdir/Docker
 	ret=$?
-	rm -f $libdir/$release/Kernel.gpg
 	[ $ret -eq 0 ] || exit $?
 	echo "Running tests in $release:"
 	docker run --rm --name=gs-test-$release \
-		--mount type=bind,source="$libdir/../../",target=/scripts,readonly \
+		--mount type=bind,source="$testdir/../../",target=/scripts,readonly \
 		gs-test-$release
 	ret=$?
 	[ $ret -eq 0 ] || exit $?
diff --git a/scripts/git_sort/tests/sle12-sp4/Dockerfile b/scripts/git_sort/tests/sle12-sp4/Dockerfile
deleted file mode 100644
index 49d8f9c..0000000
--- a/scripts/git_sort/tests/sle12-sp4/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-# http://registry.suse.de/
-FROM registry.suse.de/suse/containers/sle-server/12-sp4/containers/suse/sles12sp4:latest AS base
-
-RUN rpm -e container-suseconnect
-RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-12:/GA/standard/SUSE:SLE-12:GA.repo
-RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-12:/Update/standard/SUSE:SLE-12:Update.repo
-RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD1/ DVD1
-RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD2/ DVD2
-RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD3/ DVD3
-# RUN zypper -n ar -G http://updates.suse.de/SUSE/Products/SLE-SDK/12-SP4/$(rpm -E %_arch)/product/ SDK
-RUN zypper -n ar http://download.suse.de/update/build.suse.de/SUSE/Updates/SLE-SERVER/12-SP4/$(rpm -E %_arch)/update/SUSE:Updates:SLE-SERVER:12-SP4:$(rpm -E %_arch).repo
-
-RUN zypper -n ref
-
-FROM base AS packages
-
-RUN zypper -n in git-core python3 python3-dbm rcs
-
-RUN git config --global user.email "you@example.com"
-RUN git config --global user.name "Your Name"
-
-COPY Kernel.gpg /tmp
-RUN rpmkeys --import /tmp/Kernel.gpg
-RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/SLE_12_SP4/Kernel:tools.repo
-RUN zypper -n in python3-pygit2 quilt
-
-FROM packages
-
-VOLUME /scripts
-
-WORKDIR /scripts/git_sort
-
-CMD python3 -m unittest discover -v
diff --git a/scripts/git_sort/tests/sle12-sp5/Dockerfile b/scripts/git_sort/tests/sle12-sp5/Dockerfile
deleted file mode 100644
index f5e2f58..0000000
--- a/scripts/git_sort/tests/sle12-sp5/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-# http://registry.suse.de/
-FROM registry.suse.de/suse/containers/sle-server/12-sp5/containers/suse/sles12sp5:latest AS base
-
-RUN rpm -e container-suseconnect
-RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-12:/GA/standard/SUSE:SLE-12:GA.repo
-RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-12:/Update/standard/SUSE:SLE-12:Update.repo
-RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD1/ DVD1
-RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD2/ DVD2
-RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD3/ DVD3
-# RUN zypper -n ar -G http://updates.suse.de/SUSE/Products/SLE-SDK/12-SP5/$(rpm -E %_arch)/product/ SDK
-RUN zypper -n ar http://download.suse.de/update/build.suse.de/SUSE/Updates/SLE-SERVER/12-SP5/$(rpm -E %_arch)/update/SUSE:Updates:SLE-SERVER:12-SP5:$(rpm -E %_arch).repo
-
-RUN zypper -n ref
-
-FROM base AS packages
-
-RUN zypper -n in git-core python3 python3-dbm rcs
-
-RUN git config --global user.email "you@example.com"
-RUN git config --global user.name "Your Name"
-
-COPY Kernel.gpg /tmp
-RUN rpmkeys --import /tmp/Kernel.gpg
-RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/SLE_12_SP5/Kernel:tools.repo
-RUN zypper -n in python3-pygit2 quilt
-
-FROM packages
-
-VOLUME /scripts
-
-WORKDIR /scripts/git_sort
-
-CMD python3 -m unittest discover -v
diff --git a/scripts/git_sort/tests/sle15/Dockerfile b/scripts/git_sort/tests/sle15/Dockerfile
deleted file mode 100644
index 4d1cc54..0000000
--- a/scripts/git_sort/tests/sle15/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-# http://registry.suse.de/
-FROM registry.suse.de/suse/sle-15/update/images/suse/sle15:latest AS base
-
-RUN rpm -e container-suseconnect
-RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-15:/GA/standard/SUSE:SLE-15:GA.repo
-RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-15:/Update/standard/SUSE:SLE-15:Update.repo
-RUN zypper -n ref
-
-FROM base AS packages
-
-RUN zypper -n in git-core python3 python3-dbm rcs awk
-
-RUN git config --global user.email "you@example.com"
-RUN git config --global user.name "Your Name"
-
-COPY Kernel.gpg /tmp
-RUN rpmkeys --import /tmp/Kernel.gpg
-RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/SLE_15/Kernel:tools.repo
-RUN zypper -n in python3-pygit2 quilt
-
-FROM packages
-
-VOLUME /scripts
-
-WORKDIR /scripts/git_sort
-
-CMD python3 -m unittest discover -v