Merge branch 'runner_optimisation' into 'master'

gitlab CI run optimization

See merge request !4466

.gitlab-ci.yml

@@ -5,29 +5,57 @@ variables:
   MYSQL_ROOT_PASSWORD: root
   BOKEH_HTML_VALIDATOR_URL: "http://sthysel__nuhtml:8888"
 
-test:php74:
+test:php74_bokeh:
   image: bokeh_php74_with_chrome
   services:
     - localhost:5000/bokeh_mariadb_10.3
     - sthysel/nuhtml
   script:
     - bash scripts/ci_data_preparation.sh $MYSQL_DATABASE $MYSQL_HOST $MYSQL_ROOT_PASSWORD
-    - bash build.sh $MYSQL_DATABASE root $MYSQL_ROOT_PASSWORD $MYSQL_HOST
+    - bash build_bokeh.sh $MYSQL_DATABASE root $MYSQL_ROOT_PASSWORD $MYSQL_HOST
   except:
     - tags
   tags:
-    - docker
+    - bladerunner
 
 
-test:php81:
+test:php74_other:
+  image: bokeh_php74_with_chrome
+  services:
+    - localhost:5000/bokeh_mariadb_10.3
+    - sthysel/nuhtml
+  script:
+    - bash scripts/ci_data_preparation.sh $MYSQL_DATABASE $MYSQL_HOST $MYSQL_ROOT_PASSWORD
+    - bash build_other.sh $MYSQL_DATABASE root $MYSQL_ROOT_PASSWORD $MYSQL_HOST
+  except:
+    - tags
+  tags:
+    - sandbox
+
+
+test:php81_bokeh:
+  image: bokeh_php81
+  services:
+    - localhost:5000/bokeh_mariadb_10.3
+    - sthysel/nuhtml
+  script:
+    - bash scripts/ci_data_preparation.sh $MYSQL_DATABASE $MYSQL_HOST $MYSQL_ROOT_PASSWORD
+    - bash build_bokeh.sh $MYSQL_DATABASE root $MYSQL_ROOT_PASSWORD $MYSQL_HOST
+  except:
+    - tags
+  tags:
+    - bladerunner
+
+
+test:php81_other:
   image: bokeh_php81
   services:
     - localhost:5000/bokeh_mariadb_10.3
     - sthysel/nuhtml
   script:
     - bash scripts/ci_data_preparation.sh $MYSQL_DATABASE $MYSQL_HOST $MYSQL_ROOT_PASSWORD
-    - bash build.sh $MYSQL_DATABASE root $MYSQL_ROOT_PASSWORD $MYSQL_HOST
+    - bash build_other.sh $MYSQL_DATABASE root $MYSQL_ROOT_PASSWORD $MYSQL_HOST
   except:
     - tags
   tags:
-    - docker
+    - sandbox

build_bokeh.sh

+#!/bin/bash
+DBNAME=$1
+DBUSER=$2
+DBPASS=$3
+DBHOST=$4
+
+source ./update.sh
+cp config.ini.default config.ini
+sed -i "s/sgbd.config.host = localhost/sgbd.config.host = $DBHOST/g" config.ini
+sed -i "s/sgbd.config.username =/sgbd.config.username = $DBUSER/g" config.ini
+sed -i "s/sgbd.config.password =/sgbd.config.password = $DBPASS/g" config.ini
+sed -i "s/sgbd.config.dbname =/sgbd.config.dbname = $DBNAME/g" config.ini
+touch local.php
+
+php --version
+
+php -d display_errors=on -d error_reporting=E_ALL scripts/upgrade_db.php
+
+cd cosmogramme
+cp config.ref.php config.php
+sed -i "s/integration_server=localhost/integration_server=$DBHOST/g" config.php
+sed -i "s/integration_user=root/integration_user=$DBUSER/g" config.php
+sed -i "s/integration_pwd=root/integration_pwd=$DBPASS/g" config.php
+sed -i "s/integration_base=opac3/integration_base=$DBNAME/g" config.php
+cd ..
+
+export OPENSSL_CONF=/etc/ssl/
+
+EARLY_DESC=`php -r "echo version_compare(PHP_VERSION, '8.1', '>=') ? '--fail-error-with-desc' : '';"`
+
+phpunit -c tests/phpunit_eco.xml --list-suites && phpunit -c tests/phpunit_eco.xml \
+    && phpunit -c tests/phpunit.xml --list-suites $EARLY_DESC \
+    && phpunit -c tests/phpunit.xml --exclude-group no-ci $EARLY_DESC

build.sh → build_other.sh

@@ -26,9 +26,7 @@ cd ..
 
 export OPENSSL_CONF=/etc/ssl/
 
-phpunit -c tests/phpunit_eco.xml --list-suites && phpunit -c tests/phpunit_eco.xml \
-    && phpunit -c tests/phpunit.xml --list-suites && phpunit -c tests/phpunit.xml --exclude-group no-ci \
-    && phpunit -c tests/phpunit_db.xml --list-suites && phpunit -c tests/phpunit_db.xml --exclude-group no-ci \
+phpunit -c tests/phpunit_db.xml --list-suites && phpunit -c tests/phpunit_db.xml --exclude-group no-ci \
     && phpunit -c tests/phpunit_js.xml --list-suites && phpunit -c tests/phpunit_js.xml --exclude-group no-ci \
     && cd cosmogramme/tests && phpunit --list-suites && phpunit --exclude-group no-ci \
     && cd ../cosmozend/tests && phpunit --list-suites && phpunit --exclude-group no-ci

tests/phpunit.xml

@@ -5,6 +5,7 @@
     backupGlobals="false"
     stopOnFailure="false"
     stopOnError="false"
+    failErrorWithDesc="false"
     >
   <testsuites>    
     <testsuite name="Bokeh scenario, application, library and digital resources">

tests/phpunit_eco.xml

@@ -5,6 +5,7 @@
     backupGlobals="false"
     stopOnFailure="false"
     stopOnError="false"
+    failErrorWithDesc="false"
     >
   <testsuites>    
     <testsuite name="Bokeh Eco actions">