From 47959bde2a7327c64942a1621de1f93671da9e5e Mon Sep 17 00:00:00 2001 From: Christophe Haen Date: Fri, 20 Sep 2024 13:01:16 +0200 Subject: [PATCH 1/2] Export XRD_WRITERECOVERY=0 to avoid file loss --- create_diracosrc.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/create_diracosrc.sh b/create_diracosrc.sh index fb7f628..5e2cd9f 100644 --- a/create_diracosrc.sh +++ b/create_diracosrc.sh @@ -24,6 +24,10 @@ echo '# in setups like EOS' echo 'export DAVIX_DISABLE_REDIRECT_CACHING=1' echo '' + echo '# XROOTD options to avoid internal retry leading to lost files' + echo '# https://its.cern.ch/jira/browse/EOS-6195' + echo 'export XRD_WRITERECOVERY=0' + echo '' echo '# Set up the X509 variables' echo '' echo '# Function check if folder exist and contains files' From 32ae09b5fb149c9526f1469162ecf875495b132f Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Thu, 3 Oct 2024 10:35:55 +0200 Subject: [PATCH 2/2] Add newer macOS tests and arm64 macos tests --- .github/workflows/build-and-test.yml | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index c530a97..cd5a25d 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -138,15 +138,15 @@ jobs: - name: Run tests run: scripts/run_basic_tests.sh ${{ matrix.docker-image }} DIRACOS-*.sh - macos-tests: - name: macOS tests + macos-64-tests: + name: macOS (x86_64) tests if: github.repository == 'DIRACGrid/DIRACOS2' needs: build-installer runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: - os: [macos-11, macos-12] + os: [macos-13] steps: - uses: actions/checkout@v3 - name: Download installer @@ -160,6 +160,28 @@ jobs: source diracos/diracosrc pip install DIRAC + macos-tests: + name: macOS (arm64) tests + if: github.repository == 'DIRACGrid/DIRACOS2' + needs: build-installer + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [macos-14, macos-15] + steps: + - uses: actions/checkout@v3 + - name: Download installer + uses: actions/download-artifact@v3 + with: + name: installer-osx-arm64 + - name: Run tests + run: | + bash DIRACOS-*.sh + set -x + source diracos/diracosrc + pip install DIRAC + integration-tests-client-and-server: name: Integration tests (Py3 server) if: github.repository == 'DIRACGrid/DIRACOS2'