Merge pull request #131 from chaen/xrd_rewrite

Export XRD_WRITERECOVERY=0 to avoid file loss

.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'

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'