Merge branch '4.2-dev' of https://github.com/joomla/joomla-cms into 4…

….2-nightly # Conflicts: # .drone.yml
joomla · May 23, 2022 · 85c40be · 85c40be
2 parents be48bae + 8b66b8a
commit 85c40be
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 58 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -167,6 +167,7 @@ steps:
       - npm
     image: joomlaprojects/docker-images:systemtests
     commands:
+      - sed -i 's/tests\\/Codeception\\/_output/\\/drone\\/src\\/tests\\/Codeception\\/_output/' codeception.yml
       - php libraries/vendor/bin/codecept build
 
   - name: phpmin-api-mysql
@@ -180,17 +181,16 @@ steps:
 
   - name: phpmax-api-mysql
     depends_on:
-      - phpmin-api-mysql
+      - prepare_codeception_tests
     image: joomlaprojects/docker-images:systemtests8.1
-    failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysql
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpmax
 
 #  - name: phpnext-api-mysql
 #    depends_on:
-#      - phpmin-api-mysql
+#      - phpmax-api-mysql
 #    image: joomlaprojects/docker-images:systemtests8.2
 #    failure: ignore
 #    environment:
@@ -202,12 +202,20 @@ steps:
     depends_on:
       - prepare_codeception_tests
     image: joomlaprojects/docker-images:systemtests
-    failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgres
 
+  - name: phpmax-api-postgres
+    depends_on:
+      - prepare_codeception_tests
+    image: joomlaprojects/docker-images:systemtests8.1
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpmax
+
 #  - name: phpnext-api-postgres
 #    depends_on:
 #      - phpmin-api-postgres
@@ -218,48 +226,35 @@ steps:
 #    commands:
 #      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpnext
 
-  - name: phpmax-api-postgres
-    depends_on:
-#      - phpnext-api-postgres
-      - phpmin-api-postgres
-    image: joomlaprojects/docker-images:systemtests8.1
-    failure: ignore
-    environment:
-      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-    commands:
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgres
-
   - name: phpmin-system-mysql
     depends_on:
       - phpmax-api-mysql
       - phpmax-api-postgres
     image: joomlaprojects/docker-images:systemtests
-    failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql
 
   - name: phpmax-system-mysql
     depends_on:
-#      - phpnext-system-mysql
-      - phpmin-system-mysql
+      - phpmax-api-mysql
+      - phpmax-api-postgres
     image: joomlaprojects/docker-images:systemtests8.1
-    failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpmax
 
-  #  - name: phpnext-system-mysql
-  #    depends_on:
-  #      - phpmin-system-mysql
-  #    image: joomlaprojects/docker-images:systemtests8.2
-  #    failure: ignore
-  #    environment:
-  #      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-  #    commands:
-  #      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpnext
+#  - name: phpnext-system-mysql
+#    depends_on:
+#      - phpmax-system-mysql
+#    image: joomlaprojects/docker-images:systemtests8.2
+#    failure: ignore
+#    environment:
+#      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+#    commands:
+#      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpnext
 
   - name: phpmin-system-postgres
     depends_on:
@@ -273,28 +268,28 @@ steps:
 
   - name: phpmax-system-postgres
     depends_on:
-      - phpmin-system-postgres
+      - phpmax-api-mysql
+      - phpmax-api-postgres
     image: joomlaprojects/docker-images:systemtests8.1
-    failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpmax
 
-  #  - name: phpnext-system-postgres
-  #    depends_on:
-  #      - phpmax-system-mysql8
-  #    image: joomlaprojects/docker-images:systemtests8.2
-  #    failure: ignore
-  #    environment:
-  #      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-  #    commands:
-  #      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpnext
+#  - name: phpnext-system-postgres
+#    depends_on:
+#      - phpmax-system-postgres
+#    image: joomlaprojects/docker-images:systemtests8.2
+#    failure: ignore
+#    environment:
+#      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+#    commands:
+#      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpnext
 
   - name: phpmin-system-mysql8
     depends_on:
-      - phpmax-api-mysql
-      - phpmax-api-postgres
+      - phpmax-system-mysql
+      - phpmax-system-postgres
     image: joomlaprojects/docker-images:systemtests
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
@@ -303,23 +298,23 @@ steps:
 
   - name: phpmax-system-mysql8
     depends_on:
-      - phpmin-system-mysql8
+      - phpmax-system-mysql
+      - phpmax-system-postgres
     image: joomlaprojects/docker-images:systemtests8.1
-    failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpmax
 
-  #  - name: phpnext-system-mysql8
-  #    depends_on:
-  #      - phpmax-system-mysql
-  #    image: joomlaprojects/docker-images:systemtests8.2
-  #    failure: ignore
-  #    environment:
-  #      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-  #    commands:
-  #      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpnext
+#  - name: phpnext-system-mysql8
+#    depends_on:
+#      - phpmax-system-mysql8
+#    image: joomlaprojects/docker-images:systemtests8.2
+#    failure: ignore
+#    environment:
+#      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+#    commands:
+#      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpnext
 
   - name: artifacts-system-tests
     image: cschlosser/drone-ftps
@@ -490,6 +485,6 @@ steps:
 
 ---
 kind: signature
-hmac: a7775c6a19c857201b1534a18d277b9cfcd9662290820f65b54ed32a4b22e4fa
+hmac: cc0ace4bc9d4342f424e480bc4dad0c9ef2bf452492a9a6811624751cd4e7c16
 
 ...
diff --git a/tests/Codeception/drone-api-run.sh b/tests/Codeception/drone-api-run.sh
@@ -18,8 +18,12 @@ google-chrome --version
 
 echo "[RUNNER] Start Selenium"
 selenium-standalone start > selenium.api.$DB_ENGINE.log 2>&1 &
-echo "Waiting 6 seconds till Selenium is ready..."
-sleep 6
+echo -n "Waiting until Selenium is ready"
+until $(curl --output /dev/null --silent --head --fail http://localhost:4444/wd/hub/status); do
+    printf '.'
+    sleep 2
+done
+echo .
 
 echo "[RUNNER] Run Codeception"
 cd /tests/www/$DB_ENGINE

diff --git a/tests/Codeception/drone-system-run.sh b/tests/Codeception/drone-system-run.sh
@@ -25,8 +25,12 @@ fi
 
 echo "[RUNNER] Start Selenium"
 selenium-standalone start > tests/Codeception/_output/selenium.$DB_ENGINE.log 2>&1 &
-echo "Waiting 6 seconds till Selenium is ready..."
-sleep 6
+echo -n "Waiting until Selenium is ready"
+until $(curl --output /dev/null --silent --head --fail http://localhost:4444/wd/hub/status); do
+    printf '.'
+    sleep 2
+done
+echo .
 
 echo "[RUNNER] Run Codeception"
 cd /tests/www/$DB_ENGINE