Skip to content

Commit 0cbb12e

Browse files
committed
Move test environment docker definition in test/
Signed-off-by: freddidierRTE <[email protected]>
1 parent 961ee4f commit 0cbb12e

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

CICD/github/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# Script launch form the root of the git project by github actions
1313

1414
export OF_VERSION=$(<VERSION)
15-
docker compose -f src/main/docker/test-environment/docker-compose.yml up -d
15+
docker compose -f test/test-environment/docker-compose.yml up -d
1616
source $HOME/.sdkman/bin/sdkman-init.sh;
1717
export NVM_DIR="$HOME/.nvm"
1818
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
@@ -32,6 +32,6 @@ echo "SONAR_TOKEN is not set, skipping sonar analysis."
3232
./gradlew --build-cache test jacocoTestReport buildDocker
3333
fi
3434
status_code=$?
35-
docker compose -f src/main/docker/test-environment/docker-compose.yml down
35+
docker compose -f test/test-environment/docker-compose.yml down
3636
# propagate the status code for github actions
3737
exit $status_code

docs/asciidoc/community/workflow.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2018-2024 RTE (http://www.rte-france.com)
1+
// Copyright (c) 2018-2025 RTE (http://www.rte-france.com)
22
// See AUTHORS.txt
33
// This document is subject to the terms of the Creative Commons Attribution 4.0 International license.
44
// If a copy of the license was not distributed with this
@@ -221,7 +221,7 @@ include::license_usage.adoc[leveloffset=+3]
221221
Compile and run OperatorFabric docker images is the most effective way to check any regression.
222222

223223
. Pull the submitted branch on a testing machine;
224-
. Run a `docker compose` with the `${OF_HOME}/src/main/docker/test-environment/docker-compose.yml` file;
224+
. Run a `docker compose` with the `${OF_HOME}/test/test-environment/docker-compose.yml` file;
225225
. Create `SNAPSHOT` docker images, from the `${OF_HOME}` directory with the following command: `./gradlew clean buildDocker`;
226226
. Stop the `test-environment` docker compose;
227227
. Go to `${OF_HOME}/config/docker`;

test/api/karate/buildAndLaunchAll.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#/bin/sh
22

3-
# Copyright (c) 2018-2024, RTE (http://www.rte-france.com)
3+
# Copyright (c) 2018-2025, RTE (http://www.rte-france.com)
44
# See AUTHORS.txt
55
# This Source Code Form is subject to the terms of the Mozilla Public
66
# License, v. 2.0. If a copy of the MPL was not distributed with this
77
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
88
# SPDX-License-Identifier: MPL-2.0
99
# This file is part of the OperatorFabric project.
1010

11-
dockerComposeFile=src/main/docker/test-environment/docker-compose.yml
11+
dockerComposeFile=test/test-environment/docker-compose.yml
1212
(cd ../../../
1313
echo "Stop java services"
1414
bin/run_all.sh stop

0 commit comments

Comments
 (0)