diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-03-06 20:58:12 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-03-16 13:03:35 -0700 |
| commit | 7b3f4071d5a392dfbbb56b6c453d71526f7cdf82 (patch) | |
| tree | 11d227ae07e9925acfeed9a1af06fbce423b69f2 | |
| parent | 0aed3d30cb055af58ff7760cd36bf529535a6988 (diff) | |
| download | chef-7b3f4071d5a392dfbbb56b6c453d71526f7cdf82.tar.gz | |
Only run apt-get update when we need to
This shaves 5 seconds off the non-functional / berkshelf times
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 17 | ||||
| -rwxr-xr-x | scripts/bk_tests/bk_container_prep.sh | 2 |
2 files changed, 16 insertions, 3 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index e7195c841b..227685dbc7 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -34,6 +34,7 @@ steps: - label: "Functional Specs Ubuntu :ruby: 2.6" commands: - /workdir/scripts/bk_tests/bk_container_prep.sh + - apt-get update -y - apt-get install -y cron locales # needed for functional tests to pass - cd /workdir; bundle install --jobs=3 --retry=3 --without omnibus_package docgen ruby_prof - bundle exec rake spec:functional @@ -262,10 +263,11 @@ steps: - FORCE_FFI_YAJL=ext - CHEF_LICENSE=accept-no-persist - INTEGRATION_SPECS_25=1 -# + - label: "Functional Specs :ruby: 2.5" commands: - /workdir/scripts/bk_tests/bk_container_prep.sh + - apt-get update -y - apt-get install -y cron locales # needed for functional tests to pass - bundle install --jobs=3 --retry=3 --without omnibus_package docgen - bundle exec rake spec:functional @@ -351,6 +353,19 @@ steps: docker: image: rubydistros/ubuntu-18.04 +- label: "Test berkshelf gem :ruby: 2.6" + commands: + - /workdir/scripts/bk_tests/bk_container_prep.sh + - apt-get update -y + - apt-get install -y graphviz + - gem install bundler -v 1.17.3 # necessary for berks Gemfile.lock for now + - bundle install --jobs=3 --retry=3 --without omnibus_package docgen + - bundle exec tasks/bin/run_external_test berkshelf/berkshelf master rake + expeditor: + executor: + docker: + image: rubydistros/ubuntu-18.04 + ######################################################################### # START TEST KITCHEN ONLY ######################################################################### diff --git a/scripts/bk_tests/bk_container_prep.sh b/scripts/bk_tests/bk_container_prep.sh index 7950a2e098..bb82b6b140 100755 --- a/scripts/bk_tests/bk_container_prep.sh +++ b/scripts/bk_tests/bk_container_prep.sh @@ -2,8 +2,6 @@ # make sure we have the network tools in place for various network specs if [ -f /etc/debian_version ]; then - echo "--- Update package cache" - apt-get update -y touch /etc/network/interfaces fi |