commit ae8b48b275737ec03a1cdc918c3cb161cee712b3
author Zack Williams <zdw@opennetworking.org> Tue Apr 16 15:00:37 2019 -0700
committer Zack Williams <zdw@opennetworking.org> Tue Apr 16 15:00:37 2019 -0700
tree 157bda1f55916ade999ee1039c3122527b317645
parent 0df89356b4f3d2df7b6f7c4dbde8d041a439da4b

[SEBA-497] Fix how xos containers are built/tested

Change-Id: I17cc8b9562021d925756ce3dc81854a45062ffd9

jjb/pipeline/xos-core.groovy

diff --git a/jjb/pipeline/xos-core.groovy b/jjb/pipeline/xos-core.groovy
index dca5f16..f7bc99e 100644
--- a/jjb/pipeline/xos-core.groovy
+++ b/jjb/pipeline/xos-core.groovy
@@ -96,11 +96,13 @@
 
            export DOCKER_REPOSITORY=xosproject/
            export DOCKER_TAG=\$(cat $WORKSPACE/cord/orchestration/xos/VERSION)
+           export DOCKER_BUILD_ARGS=--no-cache
 
-           cd $WORKSPACE/cord/orchestration/xos/containers/xos
-           make build
+           cd $WORKSPACE/cord/orchestration/xos
+           make docker-build
+
            cd $WORKSPACE/cord/orchestration/xos/testservice
-           make DOCKER_BUILD_ARGS=--no-cache docker-build
+           make docker-build
            """
       }
     }
@@ -147,6 +149,7 @@
            set -eu -o pipefail
            pushd cord/test/cord-tester/src/test/cord-api/
            source setup_venv.sh
+
            cd Tests/xos-test-service
            robot -e notready test-service.robot || true
            popd