more retries and some sleep

Signed-off-by: Vikram Karve <vikram.karve@progress.com>

2 files changed, 13 insertions, 390 deletions

diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 14b168661f..f30b69e4f4 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -11,385 +11,6 @@ expeditor:
 
 steps:
 
-#########################################################################
-  # Tests Ruby 2.6
-#########################################################################
-
-- label: "chef-utils Unit :ruby: 2.6"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - cd chef-utils
-    - bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/ubuntu-18.04:2.6
-
-- label: "chef-config Unit :ruby: 2.6"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - cd chef-config
-    - bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/ubuntu-18.04:2.6
-
-#########################################################################
-  # Tests Ruby 3.1
-#########################################################################
-
-- label: "Integration Ubuntu 18.04 :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - cd /workdir; bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec:integration
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/ubuntu-18.04:3.1
-        privileged: true
-
-- label: "Functional Ubuntu 18.04 :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - apt-get update -y
-    - apt-get install -y cron locales libarchive-dev # needed for functional tests to pass
-    - cd /workdir; bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec:functional
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/ubuntu-18.04:3.1
-        privileged: true
-
-- label: "Unit Ubuntu 18.04 :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - apt-get update -y
-    - apt-get install -y libarchive-dev
-    - bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec:unit
-    - bundle exec rake component_specs
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/ubuntu-18.04:3.1
-
-- label: "Integration Ubuntu 20.04 :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - cd /workdir; bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec:integration
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/ubuntu-20.04:3.1
-        privileged: true
-
-- label: "Functional Ubuntu 20.04 :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - apt-get update -y
-    - apt-get install -y cron locales libarchive-dev # needed for functional tests to pass
-    - cd /workdir; bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec:functional
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/ubuntu-20.04:3.1
-        privileged: true
-
-- label: "Unit Ubuntu 20.04 :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - apt-get update -y
-    - apt-get install -y libarchive-dev
-    - bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec:unit
-    - bundle exec rake component_specs
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/ubuntu-20.04:3.1
-
-- label: "Integration CentOS 7 :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - cd /workdir; bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec:integration
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/centos-7:3.1
-        privileged: true
-
-- label: "Functional CentOS 7 :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - yum install -y crontabs e2fsprogs
-    - yum install -y libarchive-devel
-    - cd /workdir; bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec:functional
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/centos-7:3.1
-        privileged: true
-
-- label: "Unit CentOS 7 :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - yum install -y libarchive-devel
-    - bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec:unit
-    - bundle exec rake component_specs
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/centos-7:3.1
-
-- label: "Integration openSUSE 15 :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - zypper install -y cron insserv-compat
-    - cd /workdir; bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec:integration
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/opensuse-15:3.1
-        privileged: true
-
-- label: "Functional openSUSE 15 :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - zypper install -y cronie insserv-compat
-    - zypper install -y libarchive-devel
-    - cd /workdir; bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec:functional
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/opensuse-15:3.1
-        privileged: true
-
-- label: "Unit openSUSE 15 :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - zypper install -y cron insserv-compat libarchive-devel
-    - bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec:unit
-    - bundle exec rake component_specs
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/opensuse-15:3.1
-
-- label: "Integration AlmaLinux 8 :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - cd /workdir; bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec:integration
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/almalinux-8:3.1
-        privileged: true
-
-- label: "Functional AlmaLinux 8 :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - dnf install -y crontabs e2fsprogs
-    - cd /workdir; bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec:functional
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/almalinux-8:3.1
-        privileged: true
-        environment:
-          - FORCE_FFI_YAJL=ext
-          - CHEF_LICENSE=accept-no-persist
-
-- label: "Unit AlmaLinux 8 :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - dnf install dnf-plugins-core -y
-    - dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y
-    - dnf config-manager --enable epel
-    - dnf config-manager --set-enabled powertools
-    - dnf install -y libarchive-devel
-    - bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec rake spec:unit
-    - bundle exec rake component_specs
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/almalinux-8:3.1
-
-- label: "Functional Windows :ruby: 2.7"
-  commands:
-    - .expeditor/scripts/bk_win_functional.ps1
-  expeditor:
-    executor:
-      windows:
-        privileged: true
-        single-use: true
-        shell: ["powershell", "-Command"]
-
-- label: "Integration Windows :ruby: 3.0"
-  commands:
-    - /workdir/.expeditor/scripts/bk_win_integration.ps1
-  expeditor:
-    executor:
-      docker:
-        host_os: windows
-        image: rubydistros/windows-2019:3.0
-        environment:
-          - FORCE_FFI_YAJL=ext
-          - CHEF_LICENSE=accept-no-persist
-        shell: ["powershell", "-Command"]
-
-- label: "Unit Windows :ruby: 3.0"
-  commands:
-    - /workdir/.expeditor/scripts/bk_win_unit.ps1
-  expeditor:
-    executor:
-      docker:
-        host_os: windows
-        image: rubydistros/windows-2019:3.0
-        environment:
-          - FORCE_FFI_YAJL=ext
-          - CHEF_LICENSE=accept-no-persist
-        shell: ["powershell", "-Command"]
-
-#########################################################################
-  # EXTERNAL GEM TESTING
-#########################################################################
-
-- label: "chef-zero gem :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec tasks/bin/run_external_test chef/chef-zero main rake pedant
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/ubuntu-18.04:3.1
-        environment:
-          - PEDANT_OPTS=--skip-oc_id
-          - CHEF_FS=true
-
-- label: "cheffish gem :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec tasks/bin/run_external_test chef/cheffish main rake spec
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/ubuntu-18.04:3.1
-
-- label: "chefspec gem :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec tasks/bin/run_external_test chefspec/chefspec main rake
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/ubuntu-18.04:3.1
-
-- label: "knife-windows gem :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - bundle config set --local without omnibus_package
-    - bundle config set --local path 'vendor/bundle'
-    - bundle install --jobs=3 --retry=3
-    - bundle exec tasks/bin/run_external_test chef/knife-windows main rake spec
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/ubuntu-18.04:3.1
-
-- label: "berkshelf gem :ruby: 3.1"
-  commands:
-    - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - apt-get update -y
-    - apt-get install -y graphviz
-    - bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3
-    - bundle exec tasks/bin/run_external_test berkshelf/berkshelf main rake
-  expeditor:
-    executor:
-      docker:
-        image: rubydistros/ubuntu-18.04:3.1
-
-- label: ":habicat: Linux plan"
-  commands:
-    - sudo ./.expeditor/scripts/install-hab.sh 'x86_64-linux'
-    - sudo ./.expeditor/scripts/verify-plan.sh
-  timeout_in_minutes: 60
-  expeditor:
-    executor:
-      linux:
-        privileged: true
-        single-use: true
-
-- label: ":habicat: Linux plan (kernel2)"
-  commands:
-    - sudo ./.expeditor/scripts/install-hab.sh 'x86_64-linux-kernel2'
-    - sudo ./.expeditor/scripts/verify-plan.sh
-  timeout_in_minutes: 60
-  expeditor:
-    executor:
-      linux:
-        privileged: true
-        single-use: true
-
 - label: ":habicat: Windows plan"
   commands:
     - ./.expeditor/scripts/verify-plan.ps1
diff --git a/habitat/plan.ps1 b/habitat/plan.ps1
index f61c55e665..7dee137148 100644
--- a/habitat/plan.ps1
+++ b/habitat/plan.ps1
@@ -93,18 +93,20 @@ function Invoke-Build {
             }
         }
         Write-BuildLine " ** Running the chef project's 'rake install' to install the path-based gems so they look like any other installed gem."
-        bundle exec rake install:local # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler
-        if (-not $?) {
-            Write-Warning " -- That didn't work. Let's try again."
+        #bundle exec rake install:local # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler
+        #if (-not $?) {
+        #    Write-Warning " -- That didn't work. Let's try again."
+        #    bundle exec rake install:local # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler
+        #    if (-not $?) { throw "unable to install the gems that live in directories within this repo" }
+        #}
+        $install_attempt = 0
+        do {
+            Start-Sleep -Seconds 5
+            $install_attempt++
+            Write-BuildLine "Install attempt $install_attempt"
             bundle exec rake install:local # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler
-            # if (-not $?) { throw "unable to install the gems that live in directories within this repo" }
-        }
-        gem build chef.gemspec
-        gem build chef-universal-mingw32.gemspec
-        gem build chef-bin/chef-bin.gemspec
-        gem build chef-config/chef-config.gemspec
-        gem build chef-utils/chef-utils.gemspec
-        gem build knife/knife.gemspec
+        } while ((-not $?) && $install_attempt < 10)
+
     } finally {
         Pop-Location
     }