diff options
Diffstat (limited to 'test/scenario_test')
-rw-r--r-- | test/scenario_test/README.md | 3 | ||||
-rw-r--r-- | test/scenario_test/ci-scripts/jenkins-build-script.sh | 7 | ||||
-rwxr-xr-x | test/scenario_test/ci-scripts/travis-build-script.sh | 2 | ||||
-rwxr-xr-x | test/scenario_test/ci-scripts/travis-install-script.sh | 5 |
4 files changed, 9 insertions, 8 deletions
diff --git a/test/scenario_test/README.md b/test/scenario_test/README.md index f8d1364e..5663d936 100644 --- a/test/scenario_test/README.md +++ b/test/scenario_test/README.md @@ -77,7 +77,8 @@ You also need this operation at every modification to the source code. ```shell $ cd $GOPATH/src/github.com/osrg/gobgp -$ sudo fab -f ./test/lib/base.py make_gobgp_ctn --set tag=gobgp +$ go install ./gobgp/ +$ go install ./gobgpd/ ``` ## <a name="section3"> Run test diff --git a/test/scenario_test/ci-scripts/jenkins-build-script.sh b/test/scenario_test/ci-scripts/jenkins-build-script.sh index 6baf2193..64b14c63 100644 --- a/test/scenario_test/ci-scripts/jenkins-build-script.sh +++ b/test/scenario_test/ci-scripts/jenkins-build-script.sh @@ -33,11 +33,10 @@ do done sudo docker rmi $GOBGP_IMAGE -sudo fab -f $GOBGP/test/lib/base.py make_gobgp_ctn:tag=$GOBGP_IMAGE -[ "$?" != 0 ] && exit "$?" -cd $GOBGP/gobgpd -$GOROOT/bin/go get -v +cd $GOBGP +$GOROOT/bin/go get -v ./gobgp/ +$GOROOT/bin/go get -v ./gobgpd/ cd $GOBGP/test/scenario_test ./run_all_tests.sh diff --git a/test/scenario_test/ci-scripts/travis-build-script.sh b/test/scenario_test/ci-scripts/travis-build-script.sh index 4fd654db..1ed4e05e 100755 --- a/test/scenario_test/ci-scripts/travis-build-script.sh +++ b/test/scenario_test/ci-scripts/travis-build-script.sh @@ -2,4 +2,4 @@ echo "travis-build-script.sh" -sudo PYTHONPATH=test python test/scenario_test/$TEST --gobgp-image $DOCKER_IMAGE -x -s +PYTHONPATH=test python test/scenario_test/$TEST --gobgp-image $DOCKER_IMAGE -x -s diff --git a/test/scenario_test/ci-scripts/travis-install-script.sh b/test/scenario_test/ci-scripts/travis-install-script.sh index 5270ac21..72bdc79d 100755 --- a/test/scenario_test/ci-scripts/travis-install-script.sh +++ b/test/scenario_test/ci-scripts/travis-install-script.sh @@ -2,6 +2,7 @@ echo "travis-install-script.sh" -sudo -H pip --quiet install -r test/pip-requires.txt +pip --quiet install -r test/pip-requires.txt -sudo fab -f test/lib/base.py make_gobgp_ctn:tag=$DOCKER_IMAGE,from_image=$FROM_IMAGE +go get -v ./gobgp/ +go get -v ./gobgpd/ |