expeditor fixes

Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>

2 files changed, 44 insertions, 16 deletions

diff --git a/.expeditor/scripts/bk_container_prep_knife.sh b/.expeditor/scripts/bk_container_prep_knife.sh
new file mode 100755
index 0000000000..75c8637b7e
--- /dev/null
+++ b/.expeditor/scripts/bk_container_prep_knife.sh
@@ -0,0 +1,28 @@
+# This script gets a container ready to run our various tests in BuildKite
+
+echo "--- Container Config..."
+
+source /etc/os-release
+echo $PRETTY_NAME
+
+echo "ruby version:"
+ruby -v
+echo "bundler version:"
+bundle -v
+
+echo "--- Preparing Container..."
+
+export FORCE_FFI_YAJL="ext"
+export CHEF_LICENSE="accept-no-persist"
+export BUNDLE_GEMFILE="/workdir/knife/Gemfile"
+
+# make sure we have the network tools in place for various network specs
+if [ -f /etc/debian_version ]; then
+  touch /etc/network/interfaces
+fi
+
+# remove default bundler config if there is one
+rm -f .bundle/config
+rm -rf .knife/bundle_config
+
+echo "+++ Run tests"
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index d940e1e4b1..129715801b 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -53,7 +53,7 @@ steps:
 
 - label: "Chefstyle [knife] :ruby: 2.7"
   commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep_knife.sh
     - cd /workdir/knife
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake style
@@ -75,7 +75,7 @@ steps:
 
 - label: "Integration Ubuntu 18.04 [knife] :ruby: 2.7"
   commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep_knife.sh
     - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
     - bundle exec rake spec:integration
   expeditor:
@@ -101,7 +101,7 @@ steps:
 
 - label: "Functional Ubuntu 18.04 [knife] :ruby: 2.7"
   commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep_knife.sh
     - apt-get update -y
     - apt-get install -y cron locales # needed for functional tests to pass
     - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
@@ -125,7 +125,7 @@ steps:
 
 - label: "Unit Ubuntu 18.04 [knife] :ruby: 2.7"
   commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep_knife.sh
     - cd /workdir/knife
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:unit
@@ -148,7 +148,7 @@ steps:
 
 - label: "Integration Ubuntu 20.04 [knife] :ruby: 2.7"
   commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep_knife.sh
     - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
     - bundle exec rake spec:integration
   expeditor:
@@ -172,7 +172,7 @@ steps:
 
 - label: "Functional Ubuntu 20.04 [knife] :ruby: 2.7"
   commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep_knife.sh
     - apt-get update -y
     - apt-get install -y cron locales # needed for functional tests to pass
     - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
@@ -196,7 +196,7 @@ steps:
 
 - label: "Unit Ubuntu 20.04 [knife] :ruby: 2.7"
   commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep_knife.sh
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:unit
   expeditor:
@@ -218,7 +218,7 @@ steps:
 
 - label: "Integration CentOS 7 [knife] :ruby: 2.7"
   commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep_knife.sh
     - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
     - bundle exec rake spec:integration
   expeditor:
@@ -241,7 +241,7 @@ steps:
 
 - label: "Functional CentOS 7 [knife] :ruby: 2.7"
   commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep_knife.sh
     - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:functional
   expeditor:
@@ -264,7 +264,7 @@ steps:
 
 - label: "Unit CentOS 7 [knife] :ruby: 2.7"
   commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep_knife.sh
     - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:unit
   expeditor:
@@ -287,7 +287,7 @@ steps:
 
 - label: "Integration openSUSE [knife] 15 :ruby: 2.7"
   commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep_knife.sh
     - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
     - bundle exec rake spec:integration
   expeditor:
@@ -310,7 +310,7 @@ steps:
 
 - label: "Functional openSUSE 15 [knife] :ruby: 2.7"
   commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep_knife.sh
     - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:functional
   expeditor:
@@ -333,7 +333,7 @@ steps:
 
 - label: "Unit openSUSE 15 [knife] :ruby: 2.7"
   commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep_knife.sh
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - cd workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:unit
@@ -355,7 +355,7 @@ steps:
 
 - label: "Integration Fedora [knife] :ruby: 2.7"
   commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep_knife.sh
     - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
     - bundle exec rake spec:integration
   expeditor:
@@ -381,7 +381,7 @@ steps:
 
 - label: "Functional Fedora [knife] :ruby: 2.7"
   commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep_knife.sh
     - dnf install -y crontabs e2fsprogs
     - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:functional
@@ -409,7 +409,7 @@ steps:
 
 - label: "Unit Fedora [knife] :ruby: 2.7"
   commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep_knife.sh
     - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:unit
   expeditor: