From b00077f351a14edb28bdf719acecc2cd7bf99f4b Mon Sep 17 00:00:00 2001 From: sean Date: Tue, 11 Jun 2013 17:13:38 -0700 Subject: [PATCH] Revert strainer gate job work Includes: 1- Revert "Inject BUNDLE_PATH into cookbook builds." This reverts commit 94a023f644966a324973813572c04835488f71e8. 2- Revert "Use strainer for cookbook gate jobs" This reverts commit 174f7be6f1b7dc01e573ee79515119eba2c25815. Fix bug 1190095 Change-Id: I691afe28ef691238c8b894a693641a711945d6f2 Reviewed-on: https://review.openstack.org/32659 Reviewed-by: Jay Pipes Reviewed-by: John Dewey Reviewed-by: Jeremy Stanley Approved: Clark Boylan Reviewed-by: Clark Boylan Tested-by: Jenkins --- .../jenkins_job_builder/config/chef-jobs.yaml | 15 ------- .../jenkins_job_builder/config/macros.yaml | 35 ++++++--------- .../jenkins_job_builder/config/projects.yaml | 43 +------------------ 3 files changed, 15 insertions(+), 78 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml index 5f71b67a26..f119e0a77b 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml @@ -42,18 +42,3 @@ publishers: - console-log - -- job-template: - name: 'gate-{name}-chef-syntax' - node: '{node}' - - triggers: - - zuul - - builders: - - gerrit-git-prep - - chef-cookbook-prep - - chef-cookbook-syntax - - publishers: - - console-log diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml index 8bbfdd31ad..0a96854cdf 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml @@ -79,43 +79,36 @@ - builder: name: chef-cookbook-prep builders: - - inject: - properties-content: BUNDLE_PATH=$HOME/bundle-ruby-19 - shell: | - ruby1.9.1 /usr/bin/bundle install - ruby1.9.1 /usr/bin/bundle exec berks install + mkdir -p .cookbooks .bundle + ruby1.9.1 /usr/bin/bundle install --path=.bundle + ruby1.9.1 /usr/bin/bundle exec berks install --path=.cookbooks + COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\') + if [ -z $COOKBOOK ]; then + echo "Cookbook name not defined in metadata.rb" + exit 1 + fi - builder: name: chef-cookbook-style builders: - - inject: - properties-content: BUNDLE_PATH=$HOME/bundle-ruby-19 - shell: | - ruby1.9.1 /usr/bin/bundle exec strainer test -o tailor + COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\') + ruby1.9.1 /usr/bin/bundle exec tailor - builder: name: chef-cookbook-lint builders: - - inject: - properties-content: BUNDLE_PATH=$HOME/bundle-ruby-19 - shell: | - ruby1.9.1 /usr/bin/bundle exec strainer test -o foodcritic + COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\') + ruby1.9.1 /usr/bin/bundle exec foodcritic -f any -t ~FC003 -t ~FC023 .cookbooks/$COOKBOOK - builder: name: chef-cookbook-rspec builders: - - inject: - properties-content: BUNDLE_PATH=$HOME/bundle-ruby-19 - shell: | - ruby1.9.1 /usr/bin/bundle exec strainer test -o chefspec - -- builder: - name: chef-cookbook-syntax - builders: - - inject: - properties-content: BUNDLE_PATH=$HOME/bundle-ruby-19 - - shell: | - ruby1.9.1 /usr/bin/bundle exec strainer test -o "knife test" + COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\') + ruby1.9.1 /usr/bin/bundle exec rspec .cookbooks/$COOKBOOK - builder: name: selenium diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index baa1e5aca8..ef5f0e5015 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -969,8 +969,6 @@ node: precise jobs: - - gate-{name}-chef-style - - gate-{name}-chef-syntax - gate-{name}-chef-lint - gate-{name}-chef-unit @@ -980,9 +978,8 @@ node: precise jobs: - - gate-{name}-chef-style - - gate-{name}-chef-syntax - gate-{name}-chef-lint + - gate-{name}-chef-style - gate-{name}-chef-unit - project: @@ -991,8 +988,6 @@ node: precise jobs: - - gate-{name}-chef-style - - gate-{name}-chef-syntax - gate-{name}-chef-lint - gate-{name}-chef-unit @@ -1002,8 +997,6 @@ node: precise jobs: - - gate-{name}-chef-style - - gate-{name}-chef-syntax - gate-{name}-chef-lint - gate-{name}-chef-unit @@ -1013,8 +1006,6 @@ node: precise jobs: - - gate-{name}-chef-style - - gate-{name}-chef-syntax - gate-{name}-chef-lint - gate-{name}-chef-unit @@ -1024,8 +1015,6 @@ node: precise jobs: - - gate-{name}-chef-style - - gate-{name}-chef-syntax - gate-{name}-chef-lint - gate-{name}-chef-unit @@ -1035,8 +1024,6 @@ node: precise jobs: - - gate-{name}-chef-style - - gate-{name}-chef-syntax - gate-{name}-chef-lint - gate-{name}-chef-unit @@ -1046,8 +1033,6 @@ node: precise jobs: - - gate-{name}-chef-style - - gate-{name}-chef-syntax - gate-{name}-chef-lint - gate-{name}-chef-unit @@ -1057,8 +1042,6 @@ node: precise jobs: - - gate-{name}-chef-style - - gate-{name}-chef-syntax - gate-{name}-chef-lint - gate-{name}-chef-unit @@ -1068,30 +1051,6 @@ node: precise jobs: - - gate-{name}-chef-style - - gate-{name}-chef-syntax - - gate-{name}-chef-lint - - gate-{name}-chef-unit - -- project: - name: cookbook-openstack-metering - github-org: stackforge - node: precise - - jobs: - - gate-{name}-chef-style - - gate-{name}-chef-syntax - - gate-{name}-chef-lint - - gate-{name}-chef-unit - -- project: - name: cookbook-openstack-network - github-org: stackforge - node: precise - - jobs: - - gate-{name}-chef-style - - gate-{name}-chef-syntax - gate-{name}-chef-lint - gate-{name}-chef-unit