From b2033d422de570979c2fe7ce403e7d4d6126e16e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20BERSAC?= <etienne.bersac@dalibo.com>
Date: Thu, 23 May 2024 16:13:28 +0200
Subject: [PATCH 1/4] Review e2e test matrix

---
 .circleci/config.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 08c4f6a4..160179e6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,22 +9,17 @@ workflows:
     - lint:
         name: "stage0-lint"
     - func:
-        name: "stage1-func-rockylinux8-pg16"
-        dist: rockylinux8
+        name: "stage1-func-rockylinux9-pg16"
+        dist: rockylinux9
         requires: [stage0-build]
         pgversion: "16"
     - func:
-        name: "stage1-func-rockylinux8-pg15"
+        name: "stage1-func-rockylinux8-pg14"
         dist: rockylinux8
         requires: [stage0-build]
         pgversion: "15"
     - func:
-        name: "stage1-func-rockylinux9-pg15"
-        dist: rockylinux9
-        requires: [stage0-build]
-        pgversion: "15"
-    - func:
-        name: "stage1-func-centos7-pg12"
+        name: "stage1-func-centos7-pg11"
         dist: centos7
         requires: [stage0-build]
         pgversion: "12"

From 51187acc0a07448dd9edfd320fd408a00248b17e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20BERSAC?= <etienne.bersac@dalibo.com>
Date: Thu, 23 May 2024 16:13:48 +0200
Subject: [PATCH 2/4] Rename func jobs as e2e

---
 .circleci/config.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 160179e6..264d7050 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,23 +8,23 @@ workflows:
         name: "stage0-build"
     - lint:
         name: "stage0-lint"
-    - func:
-        name: "stage1-func-rockylinux9-pg16"
+    - e2e:
+        name: "stage1-e2e-rockylinux9-pg16"
         dist: rockylinux9
         requires: [stage0-build]
         pgversion: "16"
-    - func:
-        name: "stage1-func-rockylinux8-pg14"
+    - e2e:
+        name: "stage1-e2e-rockylinux8-pg14"
         dist: rockylinux8
         requires: [stage0-build]
         pgversion: "15"
-    - func:
-        name: "stage1-func-centos7-pg11"
+    - e2e:
+        name: "stage1-e2e-centos7-pg11"
         dist: centos7
         requires: [stage0-build]
         pgversion: "12"
-    - func:
-        name: "stage1-func-centos6-pg9.5"
+    - e2e:
+        name: "stage1-e2e-centos6-pg9.5"
         dist: centos6
         requires: [stage0-build]
         pgversion: "9.5"
@@ -90,7 +90,7 @@ jobs:
         - /root/.cache/go-build
         - /go/pkg/mod
 
-  func:
+  e2e:
     parameters:
       dist:
         description: "Distribution."

From 1771b873c57424fcff0839fc1a9bc45783ba2bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20BERSAC?= <etienne.bersac@dalibo.com>
Date: Thu, 23 May 2024 16:16:36 +0200
Subject: [PATCH 3/4] Review job step names

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 264d7050..4d73738e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -50,7 +50,7 @@ jobs:
     - restore_cache:
         keys: [go-build]
     - run:
-        name: Build ldap2pg binary
+        name: Build ldap2pg binary snapshot
         command: |
           goreleaser build --clean --snapshot --single-target
     - run:
@@ -107,7 +107,7 @@ jobs:
     - attach_workspace:
         at: /home/circleci/workspace
     - run:
-        name: Run tests
+        name: Run Docker Compose
         environment:
           PGVERSION: "<< parameters.pgversion >>"
           DIST: "<< parameters.dist >>"

From 8828c2b35b2c34c11c83d6ad5cdfe0d987de6c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20BERSAC?= <etienne.bersac@dalibo.com>
Date: Thu, 23 May 2024 16:20:21 +0200
Subject: [PATCH 4/4] Drop samba smoke test output

---
 test/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/entrypoint.sh b/test/entrypoint.sh
index 4fb00c38..4dda9be9 100755
--- a/test/entrypoint.sh
+++ b/test/entrypoint.sh
@@ -47,6 +47,6 @@ psql -tc "SELECT version();"
 # ldap-utils on CentOS does not read properly current ldaprc. Linking it in ~
 # workaround this.
 ln -fsv "${PWD}/ldaprc" ~/ldaprc
-retry ldapsearch -x -v -w "${LDAPPASSWORD}" -z none
+retry ldapsearch -x -v -w "${LDAPPASSWORD}" -z none >/dev/null
 
 "$python" -m pytest test/ "$@"