Skip to content

Commit

Permalink
Fix for failing integration tests. (#76)
Browse files Browse the repository at this point in the history
  • Loading branch information
nigelgbanks authored Nov 12, 2024
1 parent c5cfdee commit 0a24db0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drupal/rootfs/etc/s6-overlay/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ source /etc/islandora/utilities.sh
readonly SITE="default"

function configure {
# Work around for when the cache is in a bad state, as Drush will access
# the cache before rebuilding it for some dumb reason, preventing
# Drush from being able to clear it.
local params=$(/var/www/drupal/web/core/scripts/rebuild_token_calculator.sh 2>/dev/null)
curl -L "${DRUPAL_DRUSH_URI}/core/rebuild.php?${params}"
# Starter site post install steps.
drush --root=/var/www/drupal --uri="${DRUPAL_DRUSH_URI}" cache:rebuild
drush --root=/var/www/drupal --uri="${DRUPAL_DRUSH_URI}" user:role:add fedoraadmin admin
Expand Down
3 changes: 3 additions & 0 deletions tests/init-template-starter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ cp ./tests/solr.php drupal/rootfs/var/www/drupal/

docker compose --profile dev up -d

echo "Waiting for installation..."
docker compose --profile dev exec drupal-dev timeout 600 bash -c "while ! test -f /installed; do sleep 5; done"

./tests/ping.sh

docker compose --profile dev exec drupal-dev drush scr solr.php

0 comments on commit 0a24db0

Please sign in to comment.