Update database matrix to include MySQL 8.4 and 9, remove 5

duanemay · duanemay · commit fb6a8db77f1a · 2025-09-05T18:35:39.000-04:00
diff --git a/.github/workflows/boot-integration-tests.yml b/.github/workflows/boot-integration-tests.yml
@@ -12,15 +12,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        database: [ 'postgresql-11', 'postgresql-15', 'postgresql-16', 'mysql', 'mysql-8' ]
+        database: [ 'postgresql-11', 'postgresql-15', 'postgresql-16', 'mysql-8', 'mysql-8.4', 'mysql-9' ]
     container:
       image: cfidentity/uaa-${{ matrix.database }}
       volumes:
         - ${{ github.workspace }}:/root/uaa
       options: --privileged --tty --interactive --shm-size=1G
     steps:
       - name: Set env
-        run: echo "DB=$(echo ${{ matrix.database }} | sed 's/[-0-9]//g')" >> $GITHUB_ENV
+        run: echo "DB=$(echo ${{ matrix.database }} | sed 's/-[0-9.]*//g')" >> $GITHUB_ENV
       - name: Check out repository code
         uses: actions/checkout@v5
       - name: Integration tests on container
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -12,15 +12,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        database: [ 'postgresql-11', 'postgresql-15', 'postgresql-16', 'mysql', 'mysql-8' ]
+        database: [ 'postgresql-11', 'postgresql-15', 'postgresql-16', 'mysql-8', 'mysql-8.4', 'mysql-9' ]
     container:
       image: cfidentity/uaa-${{ matrix.database }}
       volumes:
         - ${{ github.workspace }}:/root/uaa
       options: --privileged --tty --interactive --shm-size=1G
     steps:
       - name: Set env
-        run: echo "DB=$(echo ${{ matrix.database }} | sed 's/[-0-9]//g')" >> $GITHUB_ENV
+        run: echo "DB=$(echo ${{ matrix.database }} | sed 's/-[0-9.]*//g')" >> $GITHUB_ENV
       - name: Check out repository code
         uses: actions/checkout@v5
       - name: Integration tests on container
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -12,15 +12,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        database: [ 'postgresql-11', 'postgresql-15', 'postgresql-16', 'mysql', 'mysql-8' ]
+        database: [ 'postgresql-11', 'postgresql-15', 'postgresql-16', 'mysql-8', 'mysql-8.4', 'mysql-9' ]
     container:
       image: cfidentity/uaa-${{ matrix.database }}
       volumes:
         - ${{ github.workspace }}:/root/uaa
       options: --privileged --tty --interactive --shm-size=1G
     steps:
       - name: Set env
-        run: echo "DB=$(echo ${{ matrix.database }} | sed 's/[-0-9]//g')" >> $GITHUB_ENV
+        run: echo "DB=$(echo ${{ matrix.database }} | sed 's/-[0-9.]*//g')" >> $GITHUB_ENV
       - name: Check out repository code
         uses: actions/checkout@v5
       - name: JUnit tests on container
diff --git a/remove.me b/remove.me
diff --git a/run-integration-tests.sh b/run-integration-tests.sh
@@ -25,8 +25,8 @@ case "${DB}" in
         PROFILE_NAME="$DB"
         ;;
 
-    mysql|mysql-8)
-        DB_IMAGE_NAME=mysql-8
+  mysql-8|mysql-8.4|mysql-9)
+        DB_IMAGE_NAME=$1
         PROFILE_NAME=mysql
         ;;
 
diff --git a/run-unit-tests.sh b/run-unit-tests.sh
@@ -27,13 +27,13 @@ case "${DB}" in
         PROFILE_NAME=postgresql
         ;;
 
-    mysql|mysql-8)
-        DB_IMAGE_NAME=mysql-8
+    mysql-8|mysql-8.4|mysql-9)
+        DB_IMAGE_NAME=$1
         DB=mysql
         PROFILE_NAME=mysql
         ;;
 
-    mysql-5)
+    mysql|mysql-5)
         DB_IMAGE_NAME=mysql
         DB=mysql
         PROFILE_NAME=mysql
diff --git a/scripts/integration-tests b/scripts/integration-tests
@@ -3,4 +3,8 @@ set -eu -o pipefail
 
 UAA_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 
-"${UAA_DIR}/scripts/gradle" integrationTest "${@}"
+if [ "$#" -eq 0 ]; then
+    "${UAA_DIR}/scripts/gradle" integrationTest
+else
+    "${UAA_DIR}/scripts/gradle" integrationTest "${@}"
+fi
diff --git a/scripts/integration-tests.sh b/scripts/integration-tests.sh
@@ -32,14 +32,11 @@ source $DIR/start_db_helper.sh
 
 TESTENV="$1"
 BOOT="${2:-false}"
-
-
 SKIP_BOOT_RUN="-Dcargo.tests.run=true"
 if [[ "${BOOT:-false}" = 'boot' ]]; then
   SKIP_BOOT_RUN="-Dcargo.tests.run=false"
 fi
 
-
 cat <<EOF >>/etc/hosts
 127.0.0.1 testzone1.localhost
 127.0.0.1 testzone2.localhost
@@ -48,14 +45,28 @@ cat <<EOF >>/etc/hosts
 127.0.0.1 testzonedoesnotexist.localhost
 127.0.0.1 oidcloginit.localhost
 127.0.0.1 testzoneinactive.localhost
+127.0.0.1 ldap01.example.com
 EOF
 
 bootDB "${DB}"
 
 pushd $(dirname $DIR)
-  /etc/init.d/slapd start
-  ldapadd -Y EXTERNAL -H ldapi:/// -f ./scripts/ldap/ldap_slapd_schema.ldif
-  ldapadd -x -D 'cn=admin,dc=test,dc=com' -w password -f ./scripts/ldap/ldap_slapd_data.ldif
+  if [ -f /etc/init.d/slapd ]; then
+    # Debian Linux: slapd started via init.d
+    /etc/init.d/slapd start
+    sleep 5
+    ldapadd -Y EXTERNAL -H ldapi:/// -f ./scripts/ldap/ldap_slapd_schema.ldif
+    ldapadd -x -D 'cn=admin,dc=test,dc=com' -w password -f ./scripts/ldap/ldap_slapd_data.ldif
+  elif [ -f /usr/local/openldap/libexec/slapd ]; then
+    # Oracle Linux: slapd started with specific command and TLS enabled
+    /usr/local/openldap/libexec/slapd -f /usr/local/openldap/etc/openldap/slapd.conf -h "ldap:/// ldaps:///" -u ldap -g ldap &
+    sleep 5
+    LDAPTLS_CACERT=/etc/ssl/certs/cacert.pem ldapadd -x -D 'cn=admin,dc=test,dc=com' -w password -H ldaps://ldap01.example.com/ -f ./scripts/ldap/ldap_slapd_schema.ldif
+    LDAPTLS_CACERT=/etc/ssl/certs/cacert.pem ldapadd -x -D 'cn=admin,dc=test,dc=com' -w password -H ldaps://ldap01.example.com/ -f ./scripts/ldap/ldap_slapd_data.ldif
+  else
+    echo "LDAP setup not detected"
+    exit 1
+  fi
 
   readonly launchBoot="nohup java -DCLOUDFOUNDRY_CONFIG_PATH=`pwd`/scripts/cargo \
                            -DSECRETS_DIR=`pwd`/scripts/cargo \
diff --git a/scripts/start_db_helper.sh b/scripts/start_db_helper.sh
@@ -10,7 +10,6 @@ function createDB() {
     true
 }
 
-
 function bootDB {
   db=$1
 
@@ -25,7 +24,6 @@ function bootDB {
         psql -c "create database $DATABASE_NAME;" -U postgres;
     }
 
-
   elif [[ "${db}" = "mysql" ]]  || [[ "${db}" = "mysql-5" ]]; then
     bootLogLocation="/var/log/mysql-boot.log"
     launchDB="(MYSQL_DATABASE=uaa MYSQL_ROOT_HOST=127.0.0.1 MYSQL_ROOT_PASSWORD='changeme' bash /entrypoint.sh mysqld &> ${bootLogLocation}) &"
@@ -91,7 +89,6 @@ function bootDB {
           fi
       done
 
-
       for db_id in `seq 1 $NUM_OF_DATABASES_TO_CREATE`; do
         createDB $db_id
       done
diff --git a/scripts/unit-tests b/scripts/unit-tests
@@ -2,5 +2,8 @@
 set -eu -o pipefail
 
 UAA_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
-
-"${UAA_DIR}/scripts/gradle" test "${@}"
+if [ "$#" -eq 0 ]; then
+    "${UAA_DIR}/scripts/gradle" test
+else
+    "${UAA_DIR}/scripts/gradle" test "${@}"
+fi
