ci: Temporary fix for interactive prompt on createuser (getsentry#1370)

iandriyanov · Mar 11, 2022 · de81299 · de81299
1 parent 1201e5d
commit de81299
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,14 +30,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - compose_version: '1.28.0'
-            compose_path: '/usr/local/bin'
-          - compose_version: '1.29.2'
-            compose_path: '/usr/local/bin'
-          - compose_version: 'v2.0.1'
-            compose_path: '/usr/local/lib/docker/cli-plugins'
-          - compose_version: 'v2.2.3'
-            compose_path: '/usr/local/lib/docker/cli-plugins'
+          - compose_version: "1.28.0"
+            compose_path: "/usr/local/bin"
+          - compose_version: "1.29.2"
+            compose_path: "/usr/local/bin"
+          - compose_version: "v2.0.1"
+            compose_path: "/usr/local/lib/docker/cli-plugins"
+          - compose_version: "v2.2.3"
+            compose_path: "/usr/local/lib/docker/cli-plugins"
+    env:
+      COMPOSE_PROJECT_NAME: self-hosted-${{ strategy.job-index }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/_integration-test/run.sh b/_integration-test/run.sh
@@ -41,7 +41,7 @@ echo "${_endgroup}"
 echo "${_group}Starting Sentry for tests ..."
 # Disable beacon for e2e tests
 echo 'SENTRY_BEACON=False' >> $SENTRY_CONFIG_PY
-$dcr web createuser --superuser --email $TEST_USER --password $TEST_PASS || true
+echo y | $dcr web createuser --force-update --superuser --email $TEST_USER --password $TEST_PASS
 $dc up -d
 printf "Waiting for Sentry to be up"; timeout 90 bash -c 'until $(curl -Isf -o /dev/null $SENTRY_TEST_HOST); do printf '.'; sleep 0.5; done'
 echo ""