Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding directory to the build to avoid concurrency problems #106

Merged
merged 1 commit into from
Aug 25, 2024
Merged

Adding directory to the build to avoid concurrency problems #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@
</dependency>
</dependencies>
<build>
<!-- To avoid problems with concurrency we change the directories of the reports and outputs -->
<testOutputDirectory>${basedir}/target/test-classes/${dirtarget}</testOutputDirectory>
<outputDirectory>${basedir}/target/classes/${dirtarget}</outputDirectory>
<!-- To avoid problems with concurrency we change the directories of the reports, outputs and build -->
<directory>${project.basedir}/target/${tjob_name}</directory>
<pluginManagement>
<plugins>
<plugin>
Expand Down
6 changes: 3 additions & 3 deletions retorchfiles/scripts/coilifecycles/coi-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ OUTPUTDIRCOI="$WORKSPACE/retorchcostestimationdata/exec$BUILD_NUMBER/COI.data"
COISETUPSTART=$(date +%s%3N)

# Prompt some system information
docker_version=$(docker --version | awk '{print $3}')
docker_version=$(docker version)
docker_compose_version=$(docker compose version | awk '{print $4}')
curl_version=$(curl --version | head -n 1 | awk '{print $2}')
kernel_version=$(uname -r)
os_version=$(cat /etc/os-release | grep PRETTY_NAME | cut -d '"' -f 2)

"$SCRIPTS_FOLDER/printLog.sh" "INFO" "COI-set-up" "Os version : $os_version, Kernel version: $kernel_version, Docker version: $docker_version, Docker-compose version: $docker_compose_version, curl-version: $curl_version"

"$SCRIPTS_FOLDER/printLog.sh" "INFO" "COI-set-up" "Os version : $os_version, Kernel version: $kernel_version, Docker-compose version: $docker_compose_version, curl-version: $curl_version"
"$SCRIPTS_FOLDER/printLog.sh" "INFO" "COI-set-up" "Full Docker versions:\n $docker_version"
# Remove older videos (older than 15 days)
remove_old_files "$SEL_VIDEO_DIR" 15

Expand Down
2 changes: 1 addition & 1 deletion retorchfiles/scripts/tjoblifecycles/tjob-testexecution.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ EXECUTE_TIMESTAMP_SCRIPT "$STAGE" "$TJOB_NAME"

LOCALHOST="$DOCKER_HOST_IP:$PORT"
# Run Maven test
mvn test -Ddirtarget="$TJOBNAME" -Dtest="$TEST_NAME" -Dtjob_name="$TJOB_NAME" -DSUT_URL="$SUT_URL" -DSUT_PORT="$PORT"
mvn test -Dtest="$TEST_NAME" -Dtjob_name="$TJOB_NAME" -DSUT_URL="$SUT_URL" -DSUT_PORT="$PORT"

# Store Test result
MVN_EXIT_CODE=$?
Expand Down