move from macro install-chefdk to chef-bootstrap

* removed macro 'install-chefdk' in favor of 'chef-bootstrap'
* macro 'chef-bootstrap' executes a cookbook specific bootstrap
  scipt which preconfigures the testnode (install packages and
  dependencies) before running the tests from the Rakefile with the job
  template 'gate-{name}-chef-rake'
* currently the bootstrap.sh does not exist in all cookbooks, since this
  is a experimental job and the final bootstrap.sh will be defined after
  this patch is merged and then cloned/added to all cookbooks using this
  job

Change-Id: I4d622b7b594aa185dd1165c913764aaeced9faae
blueprint: bootstrap-infra-test-nodes
This commit is contained in:
Jan Klare 2015-02-09 20:12:16 +01:00
parent c554963c5b
commit 6ed1a5723e
2 changed files with 5 additions and 6 deletions

View File

@ -18,7 +18,8 @@
publishers:
- console-log
# this job template requires a Rakefile in the cookbook with a task 'test' that will be run during this job
# this job template requires a bootstrap.sh script (which installs chefdk and other dependencies)
# and a Rakefile with the tests that should be executed in the cookbook
- job-template:
name: 'gate-{name}-chef-rake'
node: '{node}'
@ -30,7 +31,7 @@
builders:
- gerrit-git-prep
- install-chefdk
- chef-bootstrap
- revoke-sudo
- chef-rake-test

View File

@ -226,13 +226,11 @@
fi
- builder:
name: install-chefdk
name: chef-bootstrap
builders:
- shell: |
#!/bin/bash -x
chefdk=chefdk_0.4.0-1_amd64.deb
wget https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/$chefdk
sudo dpkg -i $chefdk
./bootstrap.sh
- builder:
name: chef-rake-test