updates jenkisfule to switch apt repos components

Signed-off-by: Andrey Kononykhin <[email protected]>
haniavis · Dec 5, 2018 · 445681e · 445681e
1 parent 45e0efb
commit 445681e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/Jenkinsfile.cd b/Jenkinsfile.cd
@@ -64,13 +64,14 @@ def buildDebUbuntu = { repoName, releaseVersion, sourcePath ->
     return "$volumeName"
 }
 
-def systemTests = { releaseVersion ->
+def systemTests = { component ->
     node("ubuntu") {
         try {
             dir("environment/docker/pool"){ 
                 stage("Prepare pool") {
-                    // TODO: add indy version to Dockerfile
                     sh '''sed -i 's/\\(RUN pip3 install python3-indy\\)/& pytest/g' core.ubuntu.dockerfile'''
+                    sh """sed -i 's/repo.sovrin.org\\/deb xenial master/repo.sovrin.org\\/deb xenial $component/g' core.ubuntu.dockerfile"""
+                    sh '''sed -i 's/sdk\\/deb xenial master/sdk\\/deb xenial stable/g' core.ubuntu.dockerfile'''
                 }
 
                 stage("Run pool") {

diff --git a/environment/docker/pool/client.ubuntu.dockerfile b/environment/docker/pool/client.ubuntu.dockerfile
diff --git a/environment/docker/pool/client_start.sh b/environment/docker/pool/client_start.sh
@@ -19,6 +19,7 @@ fi
 $SCRIPT_DIR/client_stop.sh
 
 echo "Starting container $IMAGE_NAME at $IP"
+# options are explained here: https://hub.docker.com/r/solita/ubuntu-systemd/
 docker run -itd --rm --memory="1512m" --name=$IMAGE_NAME --ip="${IP}" --network=$POOL_NETWORK_NAME --security-opt seccomp=unconfined --tmpfs /run --tmpfs /run/lock -v /sys/fs/cgroup:/sys/fs/cgroup:ro $IMAGE_NAME
 
 echo "Starting indy client"

diff --git a/environment/docker/pool/core.ubuntu.dockerfile b/environment/docker/pool/core.ubuntu.dockerfile
diff --git a/environment/docker/pool/node.init.ubuntu.dockerfile b/environment/docker/pool/node.init.ubuntu.dockerfile