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

Add some special path variables and add centos-ci dependencies

Browse Source 
Now we'll really fix the centos-ci build I think :)
This commit is contained in:
James Shubin
2016-02-10 18:09:01 -05:00
parent f4da8756bd
commit 83caea1bdc
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -1,5 +1,5 @@
SHELL = /bin/bash SHELL = /bin/bash
.PHONY: all version gopath deps run race build clean test format docs .PHONY: all version path deps run race build clean test format docs
.SILENT: clean .SILENT: clean
VERSION := $(shell git describe --match '[0-9]*\.[0-9]*\.[0-9]*' --tags --dirty --always) VERSION := $(shell git describe --match '[0-9]*\.[0-9]*\.[0-9]*' --tags --dirty --always)
@@ -11,8 +11,8 @@ all: docs
version: version:
@echo $(VERSION) @echo $(VERSION)
gopath: path:
./misc/make-gopath.sh ./misc/make-path.sh
deps: deps:
./misc/make-deps.sh ./misc/make-deps.sh

4
misc/centos-ci.py
View File

@@ -47,8 +47,8 @@ done_nodes_url = "%s/Node/done?key=%s&ssid=%s" % (url_base, apikey, ssid)
host = hosts[0] host = hosts[0]
ssh = "ssh -tt -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o SendEnv=JENKINS_URL root@%s" % host ssh = "ssh -tt -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o SendEnv=JENKINS_URL root@%s" % host
yum = 'yum -y install git wget' yum = 'yum -y install git wget tree psmisc'
omv = 'wget https://github.com/purpleidea/oh-my-vagrant/raw/master/extras/install-omv.sh && chmod u+x install-omv.sh && ./install-omv.sh && wget https://github.com/purpleidea/mgmt/raw/master/misc/make-gopath.sh && chmod u+x make-gopath.sh && ./make-gopath.sh' omv = 'wget https://github.com/purpleidea/oh-my-vagrant/raw/master/extras/install-omv.sh && chmod u+x install-omv.sh && ./install-omv.sh && wget https://github.com/purpleidea/mgmt/raw/master/misc/make-path.sh && chmod u+x make-path.sh && ./make-path.sh'
cmd = "%s '%s && %s'" % (ssh, yum, omv) # setup cmd = "%s '%s && %s'" % (ssh, yum, omv) # setup
print cmd print cmd
r = subprocess.call(cmd, shell=True) r = subprocess.call(cmd, shell=True)

13
misc/make-gopath.sh → misc/make-path.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# setup a simple go environment # setup a few environment path values
if ! env | grep -q '^GOPATH='; then if ! env | grep -q '^GOPATH='; then
export GOPATH="$HOME/gopath/" export GOPATH="$HOME/gopath/"
@@ -34,3 +34,14 @@ if ! env | grep '^PATH=' | grep -q "$GOBIN"; then
fi fi
echo "path is: $PATH" echo "path is: $PATH"
# add ~/bin/ to $PATH
if ! env | grep '^PATH=' | grep -q "$HOME/bin"; then
if ! grep -q '^export PATH="'"${HOME}/bin:${PATH}"'"' ~/.bashrc; then
echo 'export PATH="'"${HOME}/bin"':'"${PATH}"'"' >> ~/.bashrc
fi
export PATH="${PATH}" # basically useless
echo "setting path to: $PATH"
fi
echo "path is: $PATH"