Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require()
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11366 ) Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() .. Patch Set 6: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 26 Oct 2018 10:35:42 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require()
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/11366 )
Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require()
..
jenkins.sh: IMAGE_SUFFIX, docker_images_require()
Default value "master" of the IMAGE_SUFFIX environment variable can be
changed to "latest" to test the latest stable builds instead of the
nightly ones. Use docker_images_require() to make sure that the required
images are existing and up-to-date before running the tests.
Related: OS#3268
Change-Id: Idbb708ab16cb71bab5069127945b63388222369e
---
M m3ua-test/jenkins.sh
M sua-test/jenkins.sh
M ttcn3-bsc-test/jenkins-sccplite.sh
M ttcn3-bsc-test/jenkins.sh
M ttcn3-bts-test/jenkins.sh
M ttcn3-ggsn-test/jenkins.sh
M ttcn3-hlr-test/jenkins.sh
M ttcn3-mgw-test/jenkins.sh
M ttcn3-msc-test/jenkins.sh
M ttcn3-sgsn-test/jenkins.sh
M ttcn3-sip-test/jenkins.sh
11 files changed, 97 insertions(+), 18 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved; Verified
diff --git a/m3ua-test/jenkins.sh b/m3ua-test/jenkins.sh
index 61f7c05..e69e827 100755
--- a/m3ua-test/jenkins.sh
+++ b/m3ua-test/jenkins.sh
@@ -1,6 +1,12 @@
#!/bin/sh
. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "debian-jessie-build" \
+ "osmo-stp-$IMAGE_SUFFIX" \
+ "debian-stretch-titan" \
+ "m3ua-test"
mkdir $VOL_BASE_DIR/m3ua-tester
cp m3ua-param-testtool.scm all-sgp-tests.txt $VOL_BASE_DIR/m3ua-tester/
@@ -16,7 +22,7 @@
--network $NET_NAME --ip 172.18.7.200 \
-v $VOL_BASE_DIR/stp:/data \
--name ${BUILD_TAG}-stp \
- -d $REPO_USER/osmo-stp-master
+ -d $REPO_USER/osmo-stp-$IMAGE_SUFFIX
# start docker container with tests
docker run --rm \
diff --git a/sua-test/jenkins.sh b/sua-test/jenkins.sh
index 0f87b4e..5e8d4cb 100755
--- a/sua-test/jenkins.sh
+++ b/sua-test/jenkins.sh
@@ -1,6 +1,13 @@
#!/bin/sh
. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "debian-jessie-build" \
+ "osmo-stp-$IMAGE_SUFFIX" \
+ "debian-stretch-titan" \
+ "sigtran-tests" \
+ "sua-test"
mkdir $VOL_BASE_DIR/sua-tester
cp sua-param-testtool-sgp.scm some-sua-sgp-tests.txt $VOL_BASE_DIR/sua-tester/
@@ -16,7 +23,7 @@
--network $NET_NAME --ip 172.18.6.200 \
-v $VOL_BASE_DIR/stp:/data \
--name ${BUILD_TAG}-stp \
- -d $REPO_USER/osmo-stp-master
+ -d $REPO_USER/osmo-stp-$IMAGE_SUFFIX
# start docker container with tests
docker run --rm \
diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh
b/ttcn3-bsc-test/jenkins-sccplite.sh
index bceb0ec..0a6ecf3 100755
--- a/ttcn3-bsc-test/jenkins-sccplite.sh
+++ b/ttcn3-bsc-test/jenkins-sccplite.sh
@@ -1,6 +1,13 @@
#!/bin/sh
. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "debian-jessie-build" \
+ "osmo-bsc-$IMAGE_SUFFIX" \
+ "osmo-bts-$IMAGE_SUFFIX" \
+ "debian-stretch-titan" \
+ "ttcn3-bsc-test"
#Make sure NET_NAME doesn't clash with the AoIP BSC test
NET_NAME=ttcn3-bsc_sccplite-test
@@ -18,14 +25,17 @@
--network $NET_NAME --ip 172.18.12.20 \
-v $VOL_BASE_DIR/bsc:/data \
--name ${BUILD_TAG}-bsc -d \
- $REPO_USER/osmo-bsc-master
+ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX
for i in `seq 0 2`; do
echo Starting container with OML for BTS$i
docker run --rm \
--network $NET_NAME --ip 172.18.12.10$i \
--name ${BUILD_TAG}-bts$i -d \
- $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh
osmo-bts-omldummy 172.18.12.20 $((i + 1234)) 1
+ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \
+ /usr/local/bin/respawn.sh \
+ osmo-bts-omldummy \
+ 172.18.12.20 $((i + 1234)) 1
done
echo Starting container with BSC testsuite
diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh
index 7536396..ec8c23e 100755
--- a/ttcn3-bsc-test/jenkins.sh
+++ b/ttcn3-bsc-test/jenkins.sh
@@ -1,6 +1,14 @@
#!/bin/sh
. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "debian-jessie-build" \
+ "osmo-stp-$IMAGE_SUFFIX" \
+ "osmo-bsc-$IMAGE_SUFFIX" \
+ "osmo-bts-$IMAGE_SUFFIX" \
+ "debian-stretch-titan" \
+ "ttcn3-bsc-test"
mkdir $VOL_BASE_DIR/bsc-tester
cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/
@@ -18,21 +26,23 @@
--network $NET_NAME --ip 172.18.2.200 \
-v $VOL_BASE_DIR/stp:/data \
--name ${BUILD_TAG}-stp -d \
- $REPO_USER/osmo-stp-master
+ $REPO_USER/osmo-stp-$IMAGE_SUFFIX
echo Starting container with BSC
docker
Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require()
Hello Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11366 to look at the new patch set (#6). Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() .. jenkins.sh: IMAGE_SUFFIX, docker_images_require() Default value "master" of the IMAGE_SUFFIX environment variable can be changed to "latest" to test the latest stable builds instead of the nightly ones. Use docker_images_require() to make sure that the required images are existing and up-to-date before running the tests. Related: OS#3268 Change-Id: Idbb708ab16cb71bab5069127945b63388222369e --- M m3ua-test/jenkins.sh M sua-test/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh 11 files changed, 97 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/66/11366/6 -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith
Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require()
osmith has posted comments on this change. ( https://gerrit.osmocom.org/11366 ) Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() .. Patch Set 5: Verified+1 -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 22 Oct 2018 14:25:17 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require()
Hello Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11366 to look at the new patch set (#5). Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() .. jenkins.sh: IMAGE_SUFFIX, docker_images_require() Default value "master" of the IMAGE_SUFFIX environment variable can be changed to "latest" to test the latest stable builds instead of the nightly ones. Use docker_images_require() to make sure that the required images are existing and up-to-date before running the tests. Related: OS#3268 Change-Id: Idbb708ab16cb71bab5069127945b63388222369e --- M m3ua-test/jenkins.sh M sua-test/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh 11 files changed, 97 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/66/11366/5 -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith
Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require()
Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11366 ) Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() .. Patch Set 3: Code-Review+1 hmm, 'master' isn't a feed really, is it. I don't know, I would prefer some meaningful name instead of "suffix" ... but if Harald likes it then nevermind... -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 17 Oct 2018 13:32:13 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require()
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11366 ) Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() .. Patch Set 3: Code-Review+2 nice! -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 16 Oct 2018 19:55:49 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require()
osmith has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/11366 ) Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() .. jenkins.sh: IMAGE_SUFFIX, docker_images_require() Default value "master" of the IMAGE_SUFFIX environment variable can be changed to "latest" to test the latest stable builds instead of the nightly ones. Use docker_images_require() to make sure that the required images are existing and up-to-date before running the tests. Related: OS#3268 Change-Id: Idbb708ab16cb71bab5069127945b63388222369e --- M m3ua-test/jenkins.sh M sua-test/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh 11 files changed, 97 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/66/11366/3 -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr
Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require()
osmith has posted comments on this change. ( https://gerrit.osmocom.org/11366 )
Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require()
..
Patch Set 2:
(3 comments)
> As you will notice in the comments, it's not so easy for me to let go of my
> current use pattern of 'make ttcn3-bsc-test' once, then invoke jenkins.sh as
> many times I like
We discusses this in the chat after you wrote this, and you said it's okay for
you to use one of the following instead of your current
make-then-call-jenkins.sh-workflow.
$ ./jenkins.sh
$ NO_DOCKER_IMAGE_BUILD=1 ./jenkins.sh
https://gerrit.osmocom.org/#/c/11366/1/m3ua-test/jenkins.sh
File m3ua-test/jenkins.sh:
https://gerrit.osmocom.org/#/c/11366/1/m3ua-test/jenkins.sh@4
PS1, Line 4: IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
> I still prefer […]
Done
https://gerrit.osmocom.org/#/c/11366/1/m3ua-test/jenkins.sh@6
PS1, Line 6:"debian-jessie-build" \
> so it is not enough to issue the osmo-stp-foo image below, to also rebuild
> the images that it depend […]
I thought about resolving these dependencies in jenkins-common.sh, but that
would add a lot more code than the two additional lines (debian-jessie-build,
debian-stretch-titan) in these jenkins.sh files. So having it here is probably
the nicer solution, although it is a bit redundant.
https://gerrit.osmocom.org/#/c/11366/1/m3ua-test/jenkins.sh@7
PS1, Line 7:"osmo-stp-$IMAGE_SUFFIX" \
> with IMAGE_SUFFIX, I think of ".img". […]
There's already a FEED variable in
docker-playground.git/debian-repo-install-test/jenkins.sh, which takes
different values ("nightly" and "latest"). Here "master" and "latest" is
accepted, so it might get confusing.
However, if you still prefer FEED_NAME (or have another suggestion), I can
change it of course.
--
To view, visit https://gerrit.osmocom.org/11366
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e
Gerrit-Change-Number: 11366
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: osmith
Gerrit-CC: Neels Hofmeyr
Gerrit-Comment-Date: Tue, 16 Oct 2018 13:06:13 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No
Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require()
osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11366 ) Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() .. jenkins.sh: IMAGE_SUFFIX, docker_images_require() Default value "master" of the IMAGE_SUFFIX environment variable can be changed to "latest" to test the latest stable builds instead of the nightly ones. Use docker_images_require() to make sure that the required images are existing and up-to-date before running the tests. Related: OS#3268 Change-Id: Idbb708ab16cb71bab5069127945b63388222369e --- M m3ua-test/jenkins.sh M sua-test/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh 11 files changed, 97 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/66/11366/2 -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-CC: Neels Hofmeyr
