Allow selectively selecting or excluding artifact tests

Author: elprans

Makefile

@@ -29,6 +29,8 @@ GET_SHELL :=
 SSH_KEY :=
 PACKAGE_SERVER :=
 PKG_TEST_JOBS :=
+PKG_TEST_SELECT :=
+PKG_TEST_EXCLUDE :=
 
 EXTRAENV =
 EXTRAVOLUMES =
@@ -163,6 +165,8 @@ test: check-target
 		-e PKG_PLATFORM=$(PLATFORM) \
 		-e PKG_PLATFORM_VERSION=$(DISTRO) \
 		-e PKG_TEST_JOBS=$(PKG_TEST_JOBS) \
+		-e PKG_TEST_SELECT=$(PKG_TEST_SELECT) \
+		-e PKG_TEST_EXCLUDE=$(PKG_TEST_EXCLUDE) \
 		--platform $(DOCKER_PLATFORM) \
 		$(DOCKER_ARCH_PREFIX)edgedb-pkg/test:$(TARGET) \
 		$(COMMAND)

integration/linux/test/centos-7/Dockerfile

@@ -93,11 +93,23 @@ if [ -n "${PKG_TEST_JOBS}" ]; then
 else
     dash_j=""
 fi
+test_select=""
+if [ -n "${PKG_TEST_SELECT}" ]; then
+    for pattern in $PKG_TEST_SELECT; do
+      test_select="$test_select --include=${pattern}"
+    done
+fi
+test_exclude=""
+if [ -n "${PKG_TEST_EXCLUDE}" ]; then
+    for pattern in $PKG_TEST_EXCLUDE; do
+      test_exclude="$test_exclude --exclude=${pattern}"
+    done
+fi
 
 cmd="/usr/lib64/${server}/bin/python3 \
      -m edb.tools --no-devmode test \
-     /usr/share/${server}/tests \
-     -e cqa_ -e tools_ \
+     /usr/share/${server}/tests ${test_select} \
+     -e cqa_ -e tools_ ${test_exclude} \
      --verbose ${dash_j}"
 
 if [ "$1" == "bash" ]; then

integration/linux/test/centos-8/Dockerfile

@@ -101,11 +101,23 @@ if [ -n "${PKG_TEST_JOBS}" ]; then
 else
     dash_j=""
 fi
+test_select=""
+if [ -n "${PKG_TEST_SELECT}" ]; then
+    for pattern in $PKG_TEST_SELECT; do
+      test_select="$test_select --include=${pattern}"
+    done
+fi
+test_exclude=""
+if [ -n "${PKG_TEST_EXCLUDE}" ]; then
+    for pattern in $PKG_TEST_EXCLUDE; do
+      test_exclude="$test_exclude --exclude=${pattern}"
+    done
+fi
 
 cmd="/usr/lib/${machine}-linux-gnu/${server}/bin/python3 \
      -m edb.tools --no-devmode test \
-     /usr/share/${server}/tests \
-     -e cqa_ -e tools_ \
+     /usr/share/${server}/tests ${test_select} \
+     -e cqa_ -e tools_ ${test_exclude} \
      --verbose ${dash_j}"
 
 if [ "$1" == "bash" ]; then

integration/linux/test/debian-bookworm/Dockerfile

@@ -17,6 +17,18 @@ if [ -n "${PKG_TEST_JOBS}" ]; then
 else
     dash_j=""
 fi
+test_select=""
+if [ -n "${PKG_TEST_SELECT}" ]; then
+    for pattern in $PKG_TEST_SELECT; do
+      test_select="$test_select --include=${pattern}"
+    done
+fi
+test_exclude=""
+if [ -n "${PKG_TEST_EXCLUDE}" ]; then
+    for pattern in $PKG_TEST_EXCLUDE; do
+      test_exclude="$test_exclude --exclude=${pattern}"
+    done
+fi
 
 machine=$(uname -m)
 cliurl="https://packages.geldata.com/dist/${machine}-unknown-linux-musl/gel-cli"
@@ -63,6 +75,6 @@ fi
 
 exec gosu gel:gel /gel/bin/python3 \
     -m edb.tools --no-devmode test \
-    /gel/share/tests \
-    -e cqa_ -e tools_ \
+    /gel/share/tests ${test_select} \
+    --exclude="cqa_" --exclude="tools_" ${test_exclude} \
     --verbose ${dash_j}

integration/linux/test/debian-bullseye/Dockerfile

@@ -17,6 +17,18 @@ if [ -n "${PKG_TEST_JOBS}" ]; then
 else
     dash_j=""
 fi
+test_select=""
+if [ -n "${PKG_TEST_SELECT}" ]; then
+    for pattern in $PKG_TEST_SELECT; do
+      test_select="$test_select --include=${pattern}"
+    done
+fi
+test_exclude=""
+if [ -n "${PKG_TEST_EXCLUDE}" ]; then
+    for pattern in $PKG_TEST_EXCLUDE; do
+      test_exclude="$test_exclude --exclude=${pattern}"
+    done
+fi
 
 machine=$(uname -m)
 cliurl="https://packages.geldata.com/dist/${machine}-unknown-linux-musl/gel-cli"
@@ -63,6 +75,6 @@ fi
 
 exec gosu gel:gel /gel/bin/python3 \
     -m edb.tools --no-devmode test \
-    /gel/share/tests \
-    -e cqa_ -e tools_ \
+    /gel/share/tests ${test_select} \
+    -e cqa_ -e tools_ ${test_exclude} \
     --verbose ${dash_j}