Add some special path variables and add centos-ci dependencies
Now we'll really fix the centos-ci build I think :)
This commit is contained in:
6
Makefile
6
Makefile
@@ -1,5 +1,5 @@
|
||||
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
|
||||
|
||||
VERSION := $(shell git describe --match '[0-9]*\.[0-9]*\.[0-9]*' --tags --dirty --always)
|
||||
@@ -11,8 +11,8 @@ all: docs
|
||||
version:
|
||||
@echo $(VERSION)
|
||||
|
||||
gopath:
|
||||
./misc/make-gopath.sh
|
||||
path:
|
||||
./misc/make-path.sh
|
||||
|
||||
deps:
|
||||
./misc/make-deps.sh
|
||||
|
||||
@@ -47,8 +47,8 @@ done_nodes_url = "%s/Node/done?key=%s&ssid=%s" % (url_base, apikey, ssid)
|
||||
|
||||
host = hosts[0]
|
||||
ssh = "ssh -tt -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o SendEnv=JENKINS_URL root@%s" % host
|
||||
yum = 'yum -y install git wget'
|
||||
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'
|
||||
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-path.sh && chmod u+x make-path.sh && ./make-path.sh'
|
||||
cmd = "%s '%s && %s'" % (ssh, yum, omv) # setup
|
||||
print cmd
|
||||
r = subprocess.call(cmd, shell=True)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
# setup a simple go environment
|
||||
# setup a few environment path values
|
||||
|
||||
if ! env | grep -q '^GOPATH='; then
|
||||
export GOPATH="$HOME/gopath/"
|
||||
@@ -34,3 +34,14 @@ if ! env | grep '^PATH=' | grep -q "$GOBIN"; then
|
||||
fi
|
||||
|
||||
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"
|
||||
Reference in New Issue
Block a user