From c94e8c2134767cec028bb6d2a8164e1b5b6ec2a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Garc=C3=ADa=20Montoro?= Date: Sun, 4 Jun 2023 13:07:04 +0200 Subject: [PATCH] MM-53002: Fix ESR CI (#23599) * Do not use the mattermost path The /mattermost path is used by the image and it seems to conflict with the container running the binary * Use a regular machine in the esr-upgrade-diff job * Add missing space --- .github/workflows/esrupgrade-common.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/esrupgrade-common.yml b/.github/workflows/esrupgrade-common.yml index 08be10a484..b4c4af7664 100644 --- a/.github/workflows/esrupgrade-common.yml +++ b/.github/workflows/esrupgrade-common.yml @@ -61,8 +61,8 @@ jobs: --env-file=dotenv/test.env \ --env MM_SQLSETTINGS_DRIVERNAME="mysql" \ --env MM_SQLSETTINGS_DATASOURCE="mmuser:mostest@tcp(mysql:3306)/mattermost_test?charset=utf8mb4,utf8&multiStatements=true&maxAllowedPacket=4194304" \ - -v ~/work/mattermost:/mattermost \ - -w /mattermost/mattermost \ + -v ~/work/mattermost:/mm \ + -w /mm \ $BUILD_IMAGE & # In parallel, wait for the migrations to finish. # To verify this, we check that the server has finished the startup job through the log line "Server is listening on" @@ -139,7 +139,7 @@ jobs: name: upgraded-dump-script path: ${{ env.DUMP_SCRIPT_NAME }}.gz esr-upgrade-diff: - runs-on: ubuntu-latest-8-cores + runs-on: ubuntu-latest needs: - esr-upgrade-server - esr-upgrade-script