CI: reorganize test suites

- run CLI tests with "fullrepli" configuration
- remove unused test environments

.cds/oio-sds-cli.env.yml

@@ -16,13 +16,13 @@ values:
     value: "/tmp/oio/lib/pkgconfig"
 
   TEST_SUITE:
-    value: "cli,remote-account,with-service-id"
+    value: "cli"
 
   ZK_CLUSTER:
     value: "1"
 
   ZK:
-    value: "127.0.0.1:2181"
+    value: "127.0.0.1:2191"
 
   OIO_SYSTEMD_SYSTEM:
     value: "1"

.cds/oio-sds-ec.env.yml

@@ -17,7 +17,7 @@ values:
     value: "/tmp/oio/lib/pkgconfig"
 
   TEST_SUITE:
-    value: "ec,with-service-id"
+    value: "ec"
 
   ZK_CLUSTER:
     value: "1"

.cds/oio-sds-fullrepli.env.yml

@@ -17,7 +17,7 @@ values:
     value: "/tmp/oio/lib/pkgconfig"
 
   TEST_SUITE:
-    value: "repli,with-service-id,with_tls"
+    value: "repli,with_tls"
 
   ZK_CLUSTER:
     value: "1 2 3"

.cds/oio-sds-mover.env.yml

@@ -17,7 +17,7 @@ values:
     value: "/tmp/oio/lib/pkgconfig"
 
   TEST_SUITE:
-    value: "mover,with-service-id"
+    value: "mover"
 
   ZK_CLUSTER:
     value: "1"

.cds/oio-sds-rebuilder.env.yml

@@ -17,7 +17,7 @@ values:
     value: "/tmp/oio/lib/pkgconfig"
 
   TEST_SUITE:
-    value: "rebuilder,with-service-id"
+    value: "rebuilder"
 
   ZK_CLUSTER:
     value: "1"

.cds/oio-sds-single.env.yml

@@ -17,7 +17,7 @@ values:
     value: "/tmp/oio/lib/pkgconfig"
 
   TEST_SUITE:
-    value: "single,with-service-id,shallow-copy"
+    value: "single,shallow-copy,remote-account"
 
   ZK_CLUSTER:
     value: "1"

.cds/oio-sds-test-functional.pip.yml

@@ -17,7 +17,6 @@ jobs:
           echo "deb [trusted=yes] http://last-public-ovh-pcs.snap.mirrors.ovh.net/ubuntu focal main" > /etc/apt/sources.list.d/snapmirror-ovh-pcs-public.list
           echo "deb [trusted=yes] http://${DEB_SNAPSHOT}-public.canonical.ubuntu.archive.snap.mirrors.ovh.net/ubuntu focal main" > /etc/apt/sources.list.d/snapmirror-focal.list
           echo "deb [trusted=yes] http://${DEB_SNAPSHOT}-public.canonical.ubuntu.archive.snap.mirrors.ovh.net/ubuntu focal-updates main" > /etc/apt/sources.list.d/snapmirror-focal-updates.list
-          # We have troubles with FoundationDB when systemd is restarted.
           # Docker repo for docker compose plugin should be removed after https://jira.ovhcloud.tools/browse/CORDEV-2545 completion
           sudo install -m 0755 -d /etc/apt/keyrings
           curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
@@ -26,6 +25,7 @@ jobs:
             "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
             "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
             sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+          # We have troubles with FoundationDB when systemd is restarted.
           # Prevent it from being upgraded (and thus restarted).
           SYSTEMD_VERSION=$(dpkg -s libsystemd0 | sed -n -E -e 's/^Version: (\w+)/\1/p')
           apt-mark hold libsystemd0 systemd

etc/bootstrap-preset-fullrepli.yml

@@ -9,6 +9,7 @@ config:
   sqliterepo.page_size: 8192
 zookeeper: true
 redis: true
+fdb: true
 directory_replicas: 3
 container_replicas: 3
 hosts:
@@ -33,5 +34,3 @@ meta1:
   count: 7
 meta2:
   count: 7
-
-fdb: true

tools/oio-test-suites.sh

@@ -195,9 +195,6 @@ func_tests () {
 	randomize_env
 	# Some functional tests require events to be preserved after being handled
 	args="-f ${SRCDIR}/etc/bootstrap-option-preserve-events.yml"
-	if is_running_test_suite "with-service-id"; then
-		args="${args} -U"
-	fi
 	if is_running_test_suite "with-random-service-id"; then
 		args="${args} -R"
 	fi
@@ -310,9 +307,6 @@ test_cli () {
 	randomize_env
 	# Some tests require events to be preserved after being handled
 	args="-f ${SRCDIR}/etc/bootstrap-option-preserve-events.yml"
-	if is_running_test_suite "with-service-id"; then
-		args="${args} -U"
-	fi
 	$OIO_RESET ${args} -N $OIO_NS $@
 
 	cd $SRCDIR
@@ -365,32 +359,13 @@ if is_running_test_suite "repli" ; then
 		-f "${SRCDIR}/etc/bootstrap-meta1-1digits.yml"
 fi
 
-if is_running_test_suite "worm" ; then
-	echo -e "\n### WORM tests"
-	export WORM=1
-	for nb in 0 1 2 3 ; do
-		test_meta2_filters -f "${SRCDIR}/etc/bootstrap-preset-SINGLE.yml" \
-			-f "${SRCDIR}/etc/bootstrap-option-worm.yml" \
-			-f "${SRCDIR}/etc/bootstrap-meta1-${nb}digits.yml"
-	done
-	unset WORM
-fi
-
-if is_running_test_suite "slave" ; then
-	echo -e "\n### SLAVE tests"
-	export SLAVE=1
-	for nb in 0 1 2 3 ; do
-		test_meta2_filters -f "${SRCDIR}/etc/bootstrap-preset-SINGLE.yml" \
-			-f "${SRCDIR}/etc/bootstrap-option-slave.yml" \
-			-f "${SRCDIR}/etc/bootstrap-meta1-${nb}digits.yml"
-	done
-	unset SLAVE
-fi
-
 if is_running_test_suite "cli" ; then
 	echo -e "\n### CLI tests"
-	test_cli -f "${SRCDIR}/etc/bootstrap-preset-SINGLE.yml" \
-		-f "${SRCDIR}/etc/bootstrap-option-cache.yml"
+	test_cli -f "${SRCDIR}/etc/bootstrap-preset-fullrepli.yml" \
+		-f "${SRCDIR}/etc/bootstrap-option-udp.yml" \
+		-f "${SRCDIR}/etc/bootstrap-option-tls.yml" \
+		-f "${SRCDIR}/etc/bootstrap-option-cache.yml" \
+		-f "${SRCDIR}/etc/bootstrap-meta1-1digits.yml"
 fi
 
 if is_running_test_suite "3copies" ; then
@@ -412,9 +387,6 @@ func_tests_rebuilder_mover () {
 	if is_running_test_suite "zlib"; then
 		args="-f ${SRCDIR}/etc/bootstrap-option-compression-zlib.yml"
 	fi
-	if is_running_test_suite "with-service-id"; then
-		args="${args} -U"
-	fi
 	if is_running_test_suite "with-random-service-id"; then
 		args="${args} -R"
 	fi