summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaka Cho <takamune.cho@att.com>2021-01-19 13:56:54 -0500
committerTaka Cho <takamune.cho@att.com>2021-01-19 14:00:15 -0500
commit63d65925bd109a3e0c11d49e5b60c947f45468bd (patch)
tree3efcedaab2700f238975c67d9558596957e366e8
parent78bbba719bde5ea12d04266c92e7c55dcd6d9946 (diff)
change archive dir based on new JJB template
on integration-project-robot in integration/integration-macros.yaml it sets output-path: 'csit/archives' policy script has to fit this setting Issue-ID: POLICY-2895 Change-Id: Ibc6b7fb8da03bba53e82ab5bddf9a4b37a02c935 Signed-off-by: Taka Cho <takamune.cho@att.com>
-rwxr-xr-xcsit/run-project-csit.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh
index 5927b2b6..8c020b12 100755
--- a/csit/run-project-csit.sh
+++ b/csit/run-project-csit.sh
@@ -27,13 +27,13 @@ function on_exit(){
rc=$?
if [[ ${WORKSPACE} ]]; then
if [[ ${WORKDIR} ]]; then
- rsync -av "$WORKDIR/" "$WORKSPACE/archives/$TESTPLAN"
+ rsync -av "$WORKDIR/" "$WORKSPACE/csit/archives/$TESTPLAN"
fi
# Record list of active docker containers
- docker ps --format "{{.Image}}" > "$WORKSPACE/archives/$TESTPLAN/_docker-images.log"
+ docker ps --format "{{.Image}}" > "$WORKSPACE/csit/archives/$TESTPLAN/_docker-images.log"
# show memory consumption after all docker instances initialized
- docker_stats | tee "$WORKSPACE/archives/$TESTPLAN/_sysinfo-2-after-robot.txt"
+ docker_stats | tee "$WORKSPACE/csit/archives/$TESTPLAN/_sysinfo-2-after-robot.txt"
fi
# Run teardown script plan if it exists
cd "${TESTPLANDIR}/csit/plans/"
@@ -164,8 +164,8 @@ fi
export TESTOPTIONS="${2}"
-rm -rf "$WORKSPACE/archives/$TESTPLAN"
-mkdir -p "$WORKSPACE/archives/$TESTPLAN"
+rm -rf "$WORKSPACE/csit/archives/$TESTPLAN"
+mkdir -p "$WORKSPACE/csit/archives/$TESTPLAN"
TESTPLANDIR="${WORKSPACE}/${TESTPLAN}"
@@ -190,7 +190,7 @@ if [ -f "${SETUP}" ]; then
fi
# show memory consumption after all docker instances initialized
-docker_stats | tee "$WORKSPACE/archives/$TESTPLAN/_sysinfo-1-after-setup.txt"
+docker_stats | tee "$WORKSPACE/csit/archives/$TESTPLAN/_sysinfo-1-after-setup.txt"
# Run test plan
cd "$WORKDIR"