Support custom checkout paths

ls1intum · Oct 31, 2024 · 5dc159c · 5dc159c
1 parent db4f3a5
commit 5dc159c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/main/resources/templates/aeolus/c_sharp/default.sh b/src/main/resources/templates/aeolus/c_sharp/default.sh
@@ -3,12 +3,12 @@ set -e
 export AEOLUS_INITIAL_DIRECTORY=${PWD}
 build () {
   echo '⚙️ executing build'
-  dotnet build "./tests"
+  dotnet build "${testWorkingDirectory}"
 }
 
 test () {
   echo '⚙️ executing test'
-  dotnet test --logger=junit "./tests"
+  dotnet test --logger=junit "${testWorkingDirectory}"
 }
 
 main () {

diff --git a/src/main/resources/templates/aeolus/c_sharp/default.yaml b/src/main/resources/templates/aeolus/c_sharp/default.yaml
@@ -4,10 +4,10 @@ metadata:
   id: c_sharp
 actions:
   - name: build
-    script: dotnet build "./tests"
+    script: dotnet build "${testWorkingDirectory}"
   - name: test
-    script: dotnet test --logger=junit "./tests"
+    script: dotnet test --logger=junit "${testWorkingDirectory}"
     results:
       - name: NUnit Test Results
-        path: tests/TestResults/TestResults.xml
+        path: "${testWorkingDirectory}/TestResults/TestResults.xml"
         type: junit
diff --git a/src/main/resources/templates/c_sharp/test/test.csproj b/src/main/resources/templates/c_sharp/test/test.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\assignment\assignment.csproj" />
+    <ProjectReference Include="../${studentParentWorkingDirectoryName}/assignment.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/main/resources/templates/jenkins/c_sharp/regularRuns/pipeline.groovy b/src/main/resources/templates/jenkins/c_sharp/regularRuns/pipeline.groovy
@@ -29,10 +29,10 @@ private void runTestSteps() {
  */
 private void test() {
     stage('Build') {
-        sh 'dotnet build "./tests"'
+        sh 'dotnet build "${testWorkingDirectory}"'
     }
     stage('Test') {
-        sh 'dotnet test --logger=junit "./tests"'
+        sh 'dotnet test --logger=junit "${testWorkingDirectory}"'
     }
 }
 
@@ -45,11 +45,11 @@ void postBuildTasks() {
     sh '''
     rm -rf results
     mkdir results
-    if [ -e tests/TestResults/TestResults.xml ]
+    if [ -e "${testWorkingDirectory}/TestResults/TestResults.xml" ]
     then
-        sed -i 's/<testsuites[^>]*>/<testsuite>/g ; s/<\\/testsuites>/<\\/testsuite>/g' tests/TestResults/TestResults.xml
+        sed -i 's/<testsuites[^>]*>/<testsuite>/g ; s/<\\/testsuites>/<\\/testsuite>/g' "${testWorkingDirectory}/TestResults/TestResults.xml"
     fi
-    cp tests/TestResults/TestResults.xml $WORKSPACE/results/ || true
+    cp "${testWorkingDirectory}/TestResults/TestResults.xml" $WORKSPACE/results/ || true
     sed -i 's/[^[:print:]\t]/�/g' $WORKSPACE/results/*.xml || true
     '''
 }