9.3.22

- HSD8-1327 limit search results to 1 field value
- Adjust tugbaot database sync (#1143)
- HSD8-1324 Allow multiple event series for the importer
- HSD8-1323 Change tugboat to pull from hs_colorful & hs_traditional (#1138)
- HSD8-1322 Patch field group module for better browser validation

.gitpod.yml

@@ -35,21 +35,26 @@ tasks:
       export PREVIEW_FULL_URL=`gp url 8001` &&
       export PREVIEW_URL=${PREVIEW_FULL_URL#"https://"} &&
       cp .gitpod/blt.yml blt/local.blt.yml &&
-      composer update --no-interaction &&
+      composer install --no-interaction &&
       rm -rf docroot/*/custom/* &&
       composer install --prefer-source --no-interaction &&
       blt blt:telemetry:disable --no-interaction &&
       cp .gitpod/gitpod.settings.php docroot/sites/settings/local.settings.php &&
       blt settings &&
-      mysql -u root -e 'CREATE DATABASE IF NOT EXISTS drupal' &&
-      blt drupal:install -n &&
+      mysql -u root -e 'CREATE DATABASE IF NOT EXISTS drupal_default; CREATE DATABASE IF NOT EXISTS drupal' &&
       blt sws:keys &&
-      blt sbsc
-    command: |
-      apache2ctl restart
-      gp await-port 8001
-      drush uli
+      blt source:build:simplesamlphp-config &&
+      drush sql-sync @hs_colorful.prod @self --extra-dump='--no-tablespaces --insert-ignore' -y &&
+      drush updb -y &&
+      blt drupal:toggle:modules &&
+      drush cim --partial -y &&
+      drush cim --partial -y
+
+    command: >
+      git config core.fileMode false &&
+      blt blt:telemetry:disable --no-interaction &&
+      git remote set-url origin [email protected]:SU-HSDO/suhumsci.git &&
+      apache2ctl restart &&
+      gp await-port 8001 &&
+      drush uli &&
       drush uli | xargs gp preview --external
-      git config core.fileMode false
-      blt blt:telemetry:disable --no-interaction
-      git remote set-url origin [email protected]:SU-HSDO/suhumsci.git

.gitpod/gitpod.settings.php

@@ -2,6 +2,5 @@
 
 error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
 
-// Print errors on WSOD.
-ini_set('display_errors', TRUE);
-ini_set('display_startup_errors', TRUE);
+// Saml login doesn't work on gitpod. So disable it.
+$config['simplesamlphp_auth.settings']['activate'] = FALSE;

.tugboat/config.yml

@@ -13,7 +13,10 @@ services:
     default: true
 
     # Wait until the mysql service is done building
-    depends: mysql
+#    depends: mysql
+    aliases:
+      - hs-colorful
+      - hs-traditional
 
     # A set of commands to run while building this service
     commands:
@@ -34,16 +37,28 @@ services:
 
         # Copy SimpleSAMLphp configuration to prevent annoying errors.
         - blt source:build:simplesamlphp-config
-        - blt drupal:install -n
-        - drush user:create tugboat --password=tugboat
-        - drush user:role:add administrator tugboat
+      update:
+        # Sync to hs_colorful and hs_colorful database & files.
+        - blt drupal:sync:files --site=hs_colorful
+        - drush @hs_colorful.local user:create tugboat --password=tugboat
+        - drush @hs_colorful.local user:role:add administrator tugboat
+
+        - blt drupal:sync:files --site=hs_traditional
+        - drush @hs_traditional.local user:create tugboat --password=tugboat
+        - drush @hs_traditional.local user:role:add administrator tugboat
+
+        - chown -R www-data:www-data ${TUGBOAT_ROOT}/docroot/sites/*/files
       build:
         - composer install --no-ansi
-        - blt drupal:update
-        - drush pmu simplesamlphp_auth -y
+
+        - blt drupal:update --site=hs_colorful
+        - drush @hs_traditional.local pmu simplesamlphp_auth -y
+
+        - blt drupal:update --site=hs_traditional
+        - drush @hs_colorful.local pmu simplesamlphp_auth -y
 
     # Collection of urls to compare visual results.
-    visualdiffs:
+    urls:
       - /
 
   # What to call the service hosting MySQL. This name also acts as the
@@ -52,3 +67,22 @@ services:
 
     # Use the latest available 5.x version of MySQL
     image: tugboatqa/mysql:5
+    commands:
+      update:
+        # Delete and recreate the database for each site.
+        - mysql -e "DROP DATABASE IF EXISTS hs_colorful; CREATE DATABASE hs_colorful;"
+        - mysql -e "DROP DATABASE IF EXISTS hs_traditional; CREATE DATABASE hs_traditional;"
+
+        # Give the tugboat user access to the new databases.
+        - mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'tugboat'; FLUSH PRIVILEGES;"
+
+        # Download each database dump.
+        - scp [email protected]:/mnt/gfs/humscigryphon.prod/backups/prod-hs_colorful-humscigrydb423120-`date -d '8 hours ago' +%Y-%m-%d`.sql.gz /tmp/hs_colorful.sql.gz
+        - scp [email protected]:/mnt/gfs/humscigryphon.prod/backups/prod-hs_traditional-humscigrydb423132-`date -d '8 hours ago' +%Y-%m-%d`.sql.gz /tmp/hs_traditional.sql.gz
+
+        # Import each database dump into the associated table.
+        - zcat /tmp/hs_colorful.sql.gz | mysql hs_colorful
+        - zcat /tmp/hs_traditional.sql.gz | mysql hs_traditional
+
+        # Clean up after ourselves to keep the Preview size small.
+        - rm /tmp/*.sql.gz

composer.json

@@ -326,6 +326,9 @@
             "drupal/fakeobjects": {
                 "https://www.drupal.org/project/fakeobjects/issues/3002953": "https://www.drupal.org/files/issues/2020-06-22/fakeobjects-missing_plugin-3002953-5.patch"
             },
+            "drupal/field_group": {
+                "https://www.drupal.org/project/field_group/issues/2969051": "https://www.drupal.org/files/issues/2021-11-18/2969051-44.patch"
+            },
             "drupal/field_permissions": {
                 "https://www.drupal.org/project/field_permissions/issues/3272347": "patches/contrib/field_permission.patch"
             },