Merge branch 'master' into chore/update_shakapacker

DFE-Digital · Aug 8, 2024 · c7fb4d3 · c7fb4d3
2 parents a265221 + 05e376d
commit c7fb4d3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -118,7 +118,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Bring up Docker compose Stack
-        run: docker-compose -f docker-compose-ci.yml up -d
+        run: docker compose -f docker-compose-ci.yml up -d
         env:
           IMAGE: ${{needs.build.outputs.DOCKER_IMAGE}}
 
@@ -133,7 +133,7 @@ jobs:
           path: ${{ github.workspace }}/out/rubocop-result.json
 
       - name: Run Specs
-        run: docker-compose -f docker-compose-ci.yml run --rm db-tasks rspec
+        run: docker compose -f docker-compose-ci.yml run --rm db-tasks rspec
         env:
           IMAGE: ${{needs.build.outputs.DOCKER_IMAGE}}
 
@@ -218,7 +218,7 @@ jobs:
 
       - name: Run Cucumber Tests
         run: |-
-          docker-compose -f docker-compose-ci.yml run --rm \
+          docker compose -f docker-compose-ci.yml run --rm \
             -e RAILS_ENV \
             -e DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL \
             -e NODE \
@@ -262,7 +262,7 @@ jobs:
 
       - name: Run Cucumber Tests
         run: |-
-          docker-compose -f docker-compose-ci.yml run --rm \
+          docker compose -f docker-compose-ci.yml run --rm \
             -e RAILS_ENV \
             -e DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL \
             -e NODE \

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -62,12 +62,12 @@ jobs:
     displayName: Tag built image as latest
 
   - script: |
-      docker-compose up -d
+      docker compose up -d
       WAIT_COUNT=0
-      until docker-compose ps | grep -m 1 "db-tasks" | grep -m 1 "Exit 0" || [ $WAIT_COUNT -eq 12 ]; do echo "WAIT COUNT $(( WAIT_COUNT++ ))" && sleep 5 ; done
+      until docker compose ps | grep -m 1 "db-tasks" | grep -m 1 "Exit 0" || [ $WAIT_COUNT -eq 12 ]; do echo "WAIT COUNT $(( WAIT_COUNT++ ))" && sleep 5 ; done
     displayName: bring up postgres, redis and create database (for the web app) and spin up application
 
-  - script: docker-compose run --rm db-tasks rspec --format progress --format RspecJunitFormatter --out /ci_build/rspec_results.xml
+  - script: docker compose run --rm db-tasks rspec --format progress --format RspecJunitFormatter --out /ci_build/rspec_results.xml
     displayName: Run the Specs
 
   - task: PublishTestResults@2
@@ -78,7 +78,7 @@ jobs:
       testResultsFiles: rspec_results.xml
       testRunTitle: RSpec results
 
-  - script: docker-compose run --rm -e DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true db-tasks cucumber --profile=$(CUCUMBER_PROFILE) --format junit --out /ci_build/junit
+  - script: docker compose run --rm -e DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true db-tasks cucumber --profile=$(CUCUMBER_PROFILE) --format junit --out /ci_build/junit
     displayName: Run the Cucumber features
 
   - task: PublishTestResults@2
@@ -90,10 +90,10 @@ jobs:
       testRunTitle: Cucumber results
 
   - script: |
-      docker-compose -f docker-compose.yml -f docker-compose-chrome.yml up -d
+      docker compose -f docker-compose.yml -f docker-compose-chrome.yml up -d
       WAIT_COUNT=0
-      until docker-compose ps | grep -m 1 "db-tasks" | grep -m 1 "Exit 0" || [ $WAIT_COUNT -eq 12 ]; do echo "WAIT COUNT $(( WAIT_COUNT++ ))" && sleep 5 ; done
-      docker-compose -f docker-compose.yml -f docker-compose-chrome.yml run --rm \
+      until docker compose ps | grep -m 1 "db-tasks" | grep -m 1 "Exit 0" || [ $WAIT_COUNT -eq 12 ]; do echo "WAIT COUNT $(( WAIT_COUNT++ ))" && sleep 5 ; done
+      docker compose -f docker-compose.yml -f docker-compose-chrome.yml run --rm \
         -e RAILS_ENV=test \
         -e SELENIUM_HUB_HOSTNAME=selenium-chrome \
         -e DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true \

diff --git a/config/initializers/dfe_analytics.rb b/config/initializers/dfe_analytics.rb
@@ -51,4 +51,6 @@
   # to all events we send to BigQuery.
   #
   # config.environment = ENV.fetch('RAILS_ENV', 'development')
+
+  config.bigquery_maintenance_window = "08-09-2024 18:00..08-09-2024 19:00"
 end