diff --git a/src/chef-mover/jenkins/build.sh b/src/chef-mover/jenkins/build.sh index 33cce90063..c6653b072b 100755 --- 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 deleted file mode 100755 index 69528f76ae..0000000000 --- a/src/chef-mover/jenkins/builder_info.rb +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env ruby - -require 'rubygems' -require 'yajl' - -class OhNo - def ohai - if !@ohai - raw = `ohai -lerror` - @ohai = Yajl::Parser.new.parse(raw) - end - @ohai - end - - def machine - ohai["kernel"]["machine"] - end - - def os - ohai["platform"] + "-" + ohai["platform_version"] - end - - def write(path) - open(path, 'w') do |f| - f.write("export machine=#{machine}\n") - f.write("export os=#{os}\n") - end - end -end - -OhNo.new.write("machine_info") - diff --git a/src/oc_bifrost/jenkins/build.sh b/src/oc_bifrost/jenkins/build.sh index 3ff8924941..242382a441 100755 --- 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 deleted file mode 100755 index 69528f76ae..0000000000 --- a/src/oc_bifrost/jenkins/builder_info.rb +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env ruby - -require 'rubygems' -require 'yajl' - -class OhNo - def ohai - if !@ohai - raw = `ohai -lerror` - @ohai = Yajl::Parser.new.parse(raw) - end - @ohai - end - - def machine - ohai["kernel"]["machine"] - end - - def os - ohai["platform"] + "-" + ohai["platform_version"] - end - - def write(path) - open(path, 'w') do |f| - f.write("export machine=#{machine}\n") - f.write("export os=#{os}\n") - end - end -end - -OhNo.new.write("machine_info") - diff --git a/src/oc_erchef/jenkins/build.sh b/src/oc_erchef/jenkins/build.sh index c4e978efe9..dec9bb9ddb 100755 --- 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 deleted file mode 100755 index 012cf769bf..0000000000 --- a/src/oc_erchef/jenkins/builder_info.rb +++ /dev/null @@ -1,31 +0,0 @@ -#!/opt/chef/embedded/bin/ruby - -require 'rubygems' -require 'chef/json_compat' - -class OhNo - def ohai - if !@ohai - raw = `ohai -lerror` - @ohai = Chef::JSONCompat.from_json(raw) - end - @ohai - end - - def machine - ohai["kernel"]["machine"] - end - - def os - ohai["platform"] + "-" + ohai["platform_version"] - end - - def write(path) - open(path, 'w') do |f| - f.write("export machine=#{machine}\n") - f.write("export os=#{os}\n") - end - end -end - -OhNo.new.write("machine_info")