pespin submitted this change.

View Change


Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve
ttcn3-asterisk: Move ttcn3 docker related files to ttcn3/ subdir

Other files belonging to other containers are already placed in subdirs,
so do the same for these ones too.

Change-Id: Ie2b3de22df9ab155f42a717bccf718fccd388fc6
---
M ttcn3-asterisk-ims-ue-test/Dockerfile
M ttcn3-asterisk-ims-ue-test/jenkins.sh
R ttcn3-asterisk-ims-ue-test/ttcn3/Asterisk_Tests.cfg
R ttcn3-asterisk-ims-ue-test/ttcn3/ttcn3.sh
4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ttcn3-asterisk-ims-ue-test/Dockerfile b/ttcn3-asterisk-ims-ue-test/Dockerfile
index 1a2f8aa..3f37803 100644
--- a/ttcn3-asterisk-ims-ue-test/Dockerfile
+++ b/ttcn3-asterisk-ims-ue-test/Dockerfile
@@ -8,6 +8,7 @@

VOLUME /data

-COPY Asterisk_Tests.cfg /data/Asterisk_Tests.cfg
+COPY ttcn3/Asterisk_Tests.cfg /data/Asterisk_Tests.cfg
+COPY ttcn3/ttcn3.sh /data/ttcn3.sh

CMD ttcn3-docker-run asterisk Asterisk_Tests
diff --git a/ttcn3-asterisk-ims-ue-test/jenkins.sh b/ttcn3-asterisk-ims-ue-test/jenkins.sh
index a5da1d0..eba4bd8 100755
--- a/ttcn3-asterisk-ims-ue-test/jenkins.sh
+++ b/ttcn3-asterisk-ims-ue-test/jenkins.sh
@@ -15,8 +15,8 @@

mkdir $VOL_BASE_DIR/asterisk-ims-ue-tester
mkdir $VOL_BASE_DIR/asterisk-ims-ue-tester/unix
-cp ttcn3.sh $VOL_BASE_DIR/asterisk-ims-ue-tester/
-cp Asterisk_Tests.cfg $VOL_BASE_DIR/asterisk-ims-ue-tester/
+cp ttcn3/ttcn3.sh $VOL_BASE_DIR/asterisk-ims-ue-tester/
+cp ttcn3/Asterisk_Tests.cfg $VOL_BASE_DIR/asterisk-ims-ue-tester/
write_mp_osmo_repo "$VOL_BASE_DIR/asterisk-ims-ue-tester/Asterisk_Tests.cfg"

mkdir $VOL_BASE_DIR/asterisk
diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/ttcn3/Asterisk_Tests.cfg
similarity index 100%
rename from ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg
rename to ttcn3-asterisk-ims-ue-test/ttcn3/Asterisk_Tests.cfg
diff --git a/ttcn3-asterisk-ims-ue-test/ttcn3.sh b/ttcn3-asterisk-ims-ue-test/ttcn3/ttcn3.sh
similarity index 100%
rename from ttcn3-asterisk-ims-ue-test/ttcn3.sh
rename to ttcn3-asterisk-ims-ue-test/ttcn3/ttcn3.sh

To view, visit change 37330. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ie2b3de22df9ab155f42a717bccf718fccd388fc6
Gerrit-Change-Number: 37330
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged