Sync CI machinery with SL23a_0 (#494)

star-bnl · Feb 8, 2023 · daa8af0 · daa8af0
1 parent 88c6515
commit daa8af0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml
@@ -47,7 +47,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test_id: [10, 11, 22, 23, 24, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 59, 60, 76, 77, 78, 90, 91, 92, 102, 103, 119, 120, 121]
+        test_id: [10, 11, 22, 23, 24, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 59, 60, 76, 77, 78, 90, 91, 92, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121]
         compiler: [gcc485]
     env:
       STARENV: root5-${{ matrix.compiler }}
@@ -59,7 +59,7 @@ jobs:
           path: /tmp
 
       - run: docker load --input /tmp/star-sw-${{ env.STARENV }}.tar
-      - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v6
+      - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v7
       - run: |
              TEST_CMD=$(docker run --rm ghcr.io/star-bnl/star-sw-${{ env.STARENV }} tests/executest.py -c ${{ matrix.test_id }})
              # Workaround https://sft.its.cern.ch/jira/browse/ROOT-7660 in ROOT 5 by checking the output log
@@ -84,7 +84,7 @@ jobs:
           path: /tmp
 
       - run: docker load --input /tmp/star-sw-${{ env.STARENV }}.tar
-      - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v6
+      - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v7
       - run: |
              TEST_FILE=$(echo "$(docker run --rm ghcr.io/star-bnl/star-sw-${{ env.STARENV }} tests/executest.py ${{ matrix.test_id }} -a fullpath)" | sed -E 's/\.(daq|fzd)$/.event.root/')
              TEST_CMD="root4star -b -q -l 'StRoot/macros/analysis/doEvents.C(100, \"$TEST_FILE\")'"
@@ -109,7 +109,7 @@ jobs:
           path: /tmp
 
       - run: docker load --input /tmp/star-sw-${{ env.STARENV }}.tar
-      - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v6
+      - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v7
       - run: |
              TEST_FILE=$(echo "$(docker run --rm ghcr.io/star-bnl/star-sw-${{ env.STARENV }} tests/executest.py ${{ matrix.test_id }} -a fullpath)" | sed -E 's/\.(daq|fzd)$/.event.root/')
              TEST_CMD="root4star -b -q -l 'StRoot/macros/analysis/find_vertex.C(\"$TEST_FILE\")'"

diff --git a/StRoot/macros/rootlogon.C b/StRoot/macros/rootlogon.C
@@ -30,5 +30,10 @@
 
   std::cout << " *** Start at Date : " << TDatime().AsString() << std::endl;
 
-  gSystem->AddIncludePath(" -I. -I./.$STAR_HOST_SYS/include -I./StRoot -I$STAR/.$STAR_HOST_SYS/include -I$STAR/StRoot -I/usr/include/mysql");
+  gInterpreter->AddIncludePath(".");
+  gInterpreter->AddIncludePath("./.$STAR_HOST_SYS/include");
+  gInterpreter->AddIncludePath("./StRoot");
+  gInterpreter->AddIncludePath("$STAR/.$STAR_HOST_SYS/include");
+  gInterpreter->AddIncludePath("$STAR/StRoot");
+  gInterpreter->AddIncludePath("/usr/include/mysql");
 }
diff --git a/mgr/config/v0.2.3-rhel7-root5.34.38-32b.config b/mgr/config/v0.2.3-rhel7-root5.34.38-32b.config
@@ -0,0 +1,2 @@
+module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/
+module load star-env-0.2.3-root-5.34.38
diff --git a/mgr/config/v0.2.3-rhel7-root5.34.38-64b.config b/mgr/config/v0.2.3-rhel7-root5.34.38-64b.config
@@ -0,0 +1,2 @@
+module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/
+module load star-env-0.2.3-root-5.34.38
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/
		module load star-env-0.2.3-root-5.34.38