diff --git a/misc/centos-ci.py b/misc/centos-ci.py index ffd6ea04..e8b705f0 100755 --- a/misc/centos-ci.py +++ b/misc/centos-ci.py @@ -12,7 +12,7 @@ import subprocess # static argv to be used if running script inline argv = [ - #'https://github.com/purpleidea/oh-my-vagrant', # giturl + #'https://github.com/purpleidea/mgmt', # giturl #'master', #'make test', ] @@ -35,7 +35,7 @@ if len(argv) <= 1: git_url = argv[1] branch = 'master' if len(argv) > 2: branch = argv[2] -folder = os.path.splitext(os.path.basename(__file__))[0] +folder = os.path.basename(git_url) # should be project name run = 'make vtest' # the omv vtest cmd is a good option to run from this target if len(argv) > 3: run = ' '.join(argv[3:]) diff --git a/test/test-shell.sh b/test/test-shell.sh index 4a9ed613..26eafee5 100755 --- a/test/test-shell.sh +++ b/test/test-shell.sh @@ -10,7 +10,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )" # dir! cd "$DIR" >/dev/null # work from main mgmt directory make build MGMT="$DIR/test/shell/mgmt" -cp -a "$DIR/mgmt" "$MGMT" || cp -a "$GOBIN/mgmt" "$MGMT" # put a copy there +cp -a "$DIR/mgmt" "$MGMT" # put a copy there failures="" count=0