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, 8 insertions, 9 deletions
diff --git a/test/scenario_test/README.md b/test/scenario_test/README.md index df76a2e5..540f6628 100644 --- a/test/scenario_test/README.md +++ b/test/scenario_test/README.md @@ -77,8 +77,7 @@ You also need this operation at every modification to the source code. ```shell $ cd $GOPATH/src/github.com/osrg/gobgp -$ go install ./gobgp/ -$ go install ./gobgpd/ +$ sudo fab -f ./test/lib/base.py make_gobgp_ctn --set tag=gobgp ``` ## <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 64b14c63..6baf2193 100644 --- a/test/scenario_test/ci-scripts/jenkins-build-script.sh +++ b/test/scenario_test/ci-scripts/jenkins-build-script.sh @@ -33,10 +33,11 @@ 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 -$GOROOT/bin/go get -v ./gobgp/ -$GOROOT/bin/go get -v ./gobgpd/ +cd $GOBGP/gobgpd +$GOROOT/bin/go get -v 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 1ed4e05e..4fd654db 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" -PYTHONPATH=test python test/scenario_test/$TEST --gobgp-image $DOCKER_IMAGE -x -s +sudo 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 72bdc79d..5270ac21 100755 --- a/test/scenario_test/ci-scripts/travis-install-script.sh +++ b/test/scenario_test/ci-scripts/travis-install-script.sh @@ -2,7 +2,6 @@ echo "travis-install-script.sh" -pip --quiet install -r test/pip-requires.txt +sudo -H pip --quiet install -r test/pip-requires.txt -go get -v ./gobgp/ -go get -v ./gobgpd/ +sudo fab -f test/lib/base.py make_gobgp_ctn:tag=$DOCKER_IMAGE,from_image=$FROM_IMAGE |