lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Actually fix the CentOS-CI builds (I hope)

Browse Source 
It would be great to figure out how to get them to build a branch, so as
to avoid disrupting git master. Sorry!
This commit is contained in:
James Shubin
2016-02-10 17:52:21 -05:00
parent acff20c54e
commit f4da8756bd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
misc/centos-ci.py
View File

@@ -12,7 +12,7 @@ import subprocess
# static argv to be used if running script inline # static argv to be used if running script inline
argv = [ argv = [
#'https://github.com/purpleidea/oh-my-vagrant', # giturl #'https://github.com/purpleidea/mgmt', # giturl
#'master', #'master',
#'make test', #'make test',
] ]
@@ -35,7 +35,7 @@ if len(argv) <= 1:
git_url = argv[1] git_url = argv[1]
branch = 'master' branch = 'master'
if len(argv) > 2: branch = argv[2] 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 run = 'make vtest' # the omv vtest cmd is a good option to run from this target
if len(argv) > 3: run = ' '.join(argv[3:]) if len(argv) > 3: run = ' '.join(argv[3:])

2
test/test-shell.sh
View File

@@ -10,7 +10,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )" # dir!
cd "$DIR" >/dev/null # work from main mgmt directory cd "$DIR" >/dev/null # work from main mgmt directory
make build make build
MGMT="$DIR/test/shell/mgmt" 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="" failures=""
count=0 count=0