Merge pull request chef#513 from chef/mp/update-erchef-jenkins-for-ruby

update erlang project jenkins builds with omnibus-toolchain in path
elthariel · Sep 2, 2015 · e9bf7fe · e9bf7fe
2 parents 3fd4c16 + cd94928
commit e9bf7fe
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 100 deletions.
diff --git a/src/chef-mover/jenkins/build.sh b/src/chef-mover/jenkins/build.sh
@@ -6,7 +6,7 @@
 
 PROJ_NAME=mover
 
-export PATH=/opt/ruby1.9/bin:/opt/erlang/bin:$PATH:/usr/local/bin
+export PATH=/opt/omnibus-toolchain/embedded/bin:/opt/otp/17.5/bin:$PATH:/usr/local/bin
 export USE_SYSTEM_GECODE=1
 
 make distclean

diff --git a/src/chef-mover/jenkins/builder_info.rb b/src/chef-mover/jenkins/builder_info.rb
diff --git a/src/oc_bifrost/jenkins/build.sh b/src/oc_bifrost/jenkins/build.sh
@@ -6,9 +6,7 @@
 
 PROJ_NAME=oc_bifrost
 
-export PATH=/opt/erlang/bin:$PATH:/usr/local/bin
-jenkins/builder_info.rb
-source machine_info
+export PATH=/opt/omnibus-toolchain/embedded/bin:/opt/otp/17.5/bin:$PATH:/usr/local/bin
 
 make distclean
 git clean -fdX

diff --git a/src/oc_bifrost/jenkins/builder_info.rb b/src/oc_bifrost/jenkins/builder_info.rb
diff --git a/src/oc_erchef/jenkins/build.sh b/src/oc_erchef/jenkins/build.sh
@@ -5,7 +5,7 @@
 # PROJ_NAME and the make command.
 
 PROJ_NAME=oc_erchef
-export PATH=/opt/ruby1.9/bin:/opt/erlang/bin:$PATH:/usr/local/bin
+export PATH=/opt/omnibus-toolchain/embedded/bin:/opt/otp/17.5/bin:$PATH:/usr/local/bin
 export USE_SYSTEM_GECODE=1
 
 make distclean

diff --git a/src/oc_erchef/jenkins/builder_info.rb b/src/oc_erchef/jenkins/builder_info.rb