Fixups

Sjors · Jan 16, 2024 · b36b070 · b36b070
1 parent ccadbd2
commit b36b070
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -302,7 +302,7 @@ jobs:
   # May not use sudo and must run inside Docker container
   linter:
     name: 'Linter'
-    runs-on: [self-hosted, Linux]
+    runs-on: [self-hosted, Linux, X64]
     if: github.repository_owner != 'bitcoin' && github.event_name == 'pull_request'
     env:
       DOCKER_BUILDKIT: 1
@@ -322,7 +322,7 @@ jobs:
 
   centos:
     name: '32-bit CentOS, dash, gui'
-    runs-on: [self-hosted, Linux]
+    runs-on: [self-hosted, Linux, X64]
     if: github.repository_owner != 'bitcoin' && github.event_name == 'pull_request'
     env:
       FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
@@ -332,11 +332,12 @@ jobs:
         uses: actions/checkout@v4
       - name: Run in Docker
         run: |
-          ./ci/test_run_all.sh
+          docker stop $(docker ps -a -q) || true
+          env -i FILE_ENV="$FILE_ENV" MAKEJOBS="$MAKEJOBS" DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" DOCKER_HOST="$DOCKER_HOST" HOME="$HOME" PATH="$PATH" USER="$USER" bash -c './ci/test_run_all.sh'
 
   multiprocess:
     name: 'multiprocess, i686, DEBUG'
-    runs-on: [self-hosted, Linux]
+    runs-on: [self-hosted, Linux, X64]
     if: github.repository_owner != 'bitcoin' && github.event_name == 'pull_request'
     env:
       FILE_ENV: "./ci/test/00_setup_env_i686_multiprocess.sh"
@@ -346,11 +347,12 @@ jobs:
         uses: actions/checkout@v4
       - name: Run in Docker
         run: |
-          ./ci/test_run_all.sh
+          docker stop $(docker ps -a -q) || true
+          env -i FILE_ENV="$FILE_ENV" MAKEJOBS="$MAKEJOBS" DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" DOCKER_HOST="$DOCKER_HOST" HOME="$HOME" PATH="$PATH" USER="$USER" bash -c './ci/test_run_all.sh'
 
   mac_cross:
     name: 'macOS-cross, gui, no tests'
-    runs-on: [self-hosted, Linux]
+    runs-on: [self-hosted, Linux, X64]
     if: github.repository_owner != 'bitcoin' && github.event_name == 'pull_request'
     env:
       FILE_ENV: "./ci/test/00_setup_env_mac_cross.sh"
@@ -360,11 +362,12 @@ jobs:
         uses: actions/checkout@v4
       - name: Run in Docker
         run: |
-          ./ci/test_run_all.sh
+          docker stop $(docker ps -a -q) || true
+          env -i FILE_ENV="$FILE_ENV" MAKEJOBS="$MAKEJOBS" DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" DOCKER_HOST="$DOCKER_HOST" HOME="$HOME" PATH="$PATH" USER="$USER" bash -c './ci/test_run_all.sh'
 
   native_asan:
     name: 'ASan + LSan + UBSan + integer, no depends, USDT'
-    runs-on: [self-hosted, Linux]
+    runs-on: [self-hosted, Linux, X64]
     if: github.repository_owner != 'bitcoin' && github.event_name == 'pull_request'
     env:
       FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
@@ -374,11 +377,12 @@ jobs:
         uses: actions/checkout@v4
       - name: Run in Docker
         run: |
-          ./ci/test_run_all.sh
+          docker stop $(docker ps -a -q) || true
+          env -i FILE_ENV="$FILE_ENV" MAKEJOBS="$MAKEJOBS" DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" DOCKER_HOST="$DOCKER_HOST" HOME="$HOME" PATH="$PATH" USER="$USER" bash -c './ci/test_run_all.sh'
 
   native_fuzz:
     name: 'fuzzer,address,undefined,integer, no depends'
-    runs-on: [self-hosted, Linux]
+    runs-on: [self-hosted, Linux, X64]
     if: github.repository_owner != 'bitcoin' && github.event_name == 'pull_request'
     env:
       FILE_ENV: "./ci/test/00_setup_native_fuzz.sh"
@@ -388,11 +392,12 @@ jobs:
         uses: actions/checkout@v4
       - name: Run in Docker
         run: |
-          ./ci/test_run_all.sh
+          docker stop $(docker ps -a -q) || true
+          env -i FILE_ENV="$FILE_ENV" MAKEJOBS="$MAKEJOBS" DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" DOCKER_HOST="$DOCKER_HOST" HOME="$HOME" PATH="$PATH" USER="$USER" bash -c './ci/test_run_all.sh'
 
   native_msan:
     name: 'MSan, depends'
-    runs-on: [self-hosted, Linux]
+    runs-on: [self-hosted, Linux, X64]
     if: github.repository_owner != 'bitcoin' && github.event_name == 'pull_request'
     env:
       FILE_ENV: "./ci/test/00_setup_env_native_msan.sh"
@@ -402,11 +407,12 @@ jobs:
         uses: actions/checkout@v4
       - name: Run in Docker
         run: |
-          ./ci/test_run_all.sh
+          docker stop $(docker ps -a -q) || true
+          env -i FILE_ENV="$FILE_ENV" MAKEJOBS="$MAKEJOBS" DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" DOCKER_HOST="$DOCKER_HOST" HOME="$HOME" PATH="$PATH" USER="$USER" bash -c './ci/test_run_all.sh'
 
   kernel:
     name: 'no wallet, libbitcoinkernel'
-    runs-on: [self-hosted, Linux]
+    runs-on: [self-hosted, Linux, X64]
     if: github.repository_owner != 'bitcoin' && github.event_name == 'pull_request'
     env:
       FILE_ENV: "./ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh"
@@ -416,11 +422,12 @@ jobs:
         uses: actions/checkout@v4
       - name: Run in Docker
         run: |
-          ./ci/test_run_all.sh
+          docker stop $(docker ps -a -q) || true
+          env -i FILE_ENV="$FILE_ENV" MAKEJOBS="$MAKEJOBS" DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" DOCKER_HOST="$DOCKER_HOST" HOME="$HOME" PATH="$PATH" USER="$USER" bash -c './ci/test_run_all.sh'
 
   previous:
     name: 'previous releases, depends DEBUG'
-    runs-on: [self-hosted, Linux]
+    runs-on: [self-hosted, Linux, X64]
     if: github.repository_owner != 'bitcoin' && github.event_name == 'pull_request'
     env:
       FILE_ENV: "./ci/test/00_setup_env_native_previous_releases.sh"
@@ -430,11 +437,12 @@ jobs:
         uses: actions/checkout@v4
       - name: Run in Docker
         run: |
-          ./ci/test_run_all.sh
+          docker stop $(docker ps -a -q) || true
+          env -i FILE_ENV="$FILE_ENV" MAKEJOBS="$MAKEJOBS" DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" DOCKER_HOST="$DOCKER_HOST" HOME="$HOME" PATH="$PATH" USER="$USER" bash -c './ci/test_run_all.sh'
 
   tidy:
     name: 'tidy'
-    runs-on: [self-hosted, Linux]
+    runs-on: [self-hosted, Linux, X64]
     if: github.repository_owner != 'bitcoin' && github.event_name == 'pull_request'
     env:
       FILE_ENV: "./ci/test/00_setup_env_native_tidy.sh"
@@ -444,11 +452,12 @@ jobs:
         uses: actions/checkout@v4
       - name: Run in Docker
         run: |
-          ./ci/test_run_all.sh
+          docker stop $(docker ps -a -q) || true
+          env -i FILE_ENV="$FILE_ENV" MAKEJOBS="$MAKEJOBS" DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" DOCKER_HOST="$DOCKER_HOST" HOME="$HOME" PATH="$PATH" USER="$USER" bash -c './ci/test_run_all.sh'
 
   tsan:
     name: 'TSan, depends, gui'
-    runs-on: [self-hosted, Linux]
+    runs-on: [self-hosted, Linux, X64]
     if: github.repository_owner != 'bitcoin' && github.event_name == 'pull_request'
     env:
       FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"
@@ -458,11 +467,12 @@ jobs:
         uses: actions/checkout@v4
       - name: Run in Docker
         run: |
-          ./ci/test_run_all.sh
+          docker stop $(docker ps -a -q) || true
+          env -i FILE_ENV="$FILE_ENV" MAKEJOBS="$MAKEJOBS" DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" DOCKER_HOST="$DOCKER_HOST" HOME="$HOME" PATH="$PATH" USER="$USER" bash -c './ci/test_run_all.sh'
 
   win64:
     name: 'Win64, unit tests, no gui tests, no functional tests'
-    runs-on: [self-hosted, Linux]
+    runs-on: [self-hosted, Linux, X64]
     if: github.repository_owner != 'bitcoin' && github.event_name == 'pull_request'
     env:
       FILE_ENV: "./ci/test/00_setup_env_win64.sh"
@@ -472,4 +482,5 @@ jobs:
         uses: actions/checkout@v4
       - name: Run in Docker
         run: |
-          ./ci/test_run_all.sh
+          docker stop $(docker ps -a -q) || true
+          env -i FILE_ENV="$FILE_ENV" MAKEJOBS="$MAKEJOBS" DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" DOCKER_HOST="$DOCKER_HOST" HOME="$HOME" PATH="$PATH" USER="$USER" bash -c './ci/test_run_all.sh'
diff --git a/ci/test/02_run_container.sh b/ci/test/02_run_container.sh
@@ -52,7 +52,7 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
                   --mount "type=volume,src=${CONTAINER_NAME}_depends_sources,dst=$DEPENDS_DIR/sources" \
                   --mount "type=volume,src=${CONTAINER_NAME}_depends_SDKs_android,dst=$DEPENDS_DIR/SDKs/android" \
                   --mount "type=volume,src=${CONTAINER_NAME}_previous_releases,dst=$PREVIOUS_RELEASES_DIR" \
-                  --env-file /tmp/env \
+                  --env-file /tmp/env-$USER \
                   --name "$CONTAINER_NAME" \
                   "$CONTAINER_NAME")
   export CI_CONTAINER_ID