diff options
| author | dheerajd-msys <dheeraj.dubey@msystechnologies.com> | 2020-04-13 15:25:38 +0530 |
|---|---|---|
| committer | dheerajd-msys <dheeraj.dubey@msystechnologies.com> | 2020-04-13 15:50:27 +0530 |
| commit | 240b98ec820f948ca41e06f9d1d457a629565e5f (patch) | |
| tree | 49d2339c2abeb3fde2e3a65a9000ad1cec31f824 | |
| parent | ff3c80c1c415793b665d489277a437832d129d11 (diff) | |
| download | chef-240b98ec820f948ca41e06f9d1d457a629565e5f.tar.gz | |
make dep update faster
Signed-off-by: dheerajd-msys <dheeraj.dubey@msystechnologies.com>
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 10 | ||||
| -rw-r--r-- | spec/support/platform_helpers.rb | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index f6857f7ef4..d2389cde90 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -89,8 +89,7 @@ steps: - label: "Integration Specs openSUSE :ruby: 2.6" commands: - /workdir/scripts/bk_tests/bk_container_prep.sh - - zypper install -y cron - - zypper install -y insserv-compat + - zypper install -y cron insserv-compat - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen - bundle exec rake spec:integration expeditor: @@ -102,9 +101,7 @@ steps: - label: "Functional Specs openSUSE :ruby: 2.6" commands: - /workdir/scripts/bk_tests/bk_container_prep.sh - - zypper install -y cronie - - zypper install -y cron - - zypper install -y insserv-compat + - zypper install -y cronie insserv-compat - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen ruby_prof - bundle exec rake spec:functional expeditor: @@ -116,8 +113,7 @@ steps: - label: "Unit Specs openSUSE :ruby: 2.6" commands: - /workdir/scripts/bk_tests/bk_container_prep.sh - - zypper install -y cron - - zypper install -y insserv-compat + - zypper install -y cron insserv-compat - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen ruby_prof - bundle exec rake spec:unit - bundle exec rake component_specs diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb index cc761ec581..0e98fce621 100644 --- a/spec/support/platform_helpers.rb +++ b/spec/support/platform_helpers.rb @@ -231,7 +231,8 @@ def selinux_enabled? end def suse? - ::File.exists?("/etc/os-release") && /sles|suse/.match?(File.read("/etc/os-release")) + ::File.exists?("/etc/SuSE-release") || + ( ::File.exists?("/etc/os-release") && /sles|suse/.match?(File.read("/etc/os-release")) ) end def root? |