[Pkg-puppet-devel] [facter] 25/180: (FACT-375) Include facter schema for acceptance tests

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit a8ba8df74c26ea5df76982c8446e65cc734c97ce
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Mon Mar 17 11:50:38 2014 -0700

    (FACT-375) Include facter schema for acceptance tests
    
    In order to run acceptance tests the acceptance/ and schema/ directories
    need to be included in acceptance-artifacts.tar.gz. Originally we were
    cding to acceptance/ and tarring up everything in that directory which
    made it difficult to include another top level directory. This commit
    changes the logic to tar up the acceptance/ and schema/ directories from
    the project root so that we can easily preserve the original directory
    structure.
---
 acceptance/bin/ci-bootstrap-from-artifacts.sh | 6 ++----
 tasks/ci.rake                                 | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/acceptance/bin/ci-bootstrap-from-artifacts.sh b/acceptance/bin/ci-bootstrap-from-artifacts.sh
index a40b58f..9f6a81d 100755
--- a/acceptance/bin/ci-bootstrap-from-artifacts.sh
+++ b/acceptance/bin/ci-bootstrap-from-artifacts.sh
@@ -23,9 +23,7 @@ echo "BUILD_SELECTOR: ${BUILD_SELECTOR}"
 echo "PACKAGE_BUILD_STATUS: ${PACKAGE_BUILD_STATUS}"
 
 rm -rf acceptance
-mkdir acceptance
-cd acceptance
-tar -xzf ../acceptance-artifacts.tar.gz
+tar -xzf acceptance-artifacts.tar.gz
 mkdir -p log/latest
 
 echo "===== This artifact is from ====="
@@ -37,7 +35,7 @@ if [[ "${platform}" =~ 'solaris' ]]; then
   repo_proxy="  :repo_proxy => false,"
 fi
 
-cat > local_options.rb <<-EOF
+cat > acceptance/local_options.rb <<-EOF
 {
   :hosts_file => 'config/nodes/${platform}.yaml',
   :ssh => {
diff --git a/tasks/ci.rake b/tasks/ci.rake
index b082a1b..e758138 100644
--- a/tasks/ci.rake
+++ b/tasks/ci.rake
@@ -9,10 +9,8 @@ namespace "ci" do
 
   desc "Tar up the acceptance/ directory so that package test runs have tests to run against."
   task :acceptance_artifacts => :tag_creator do
-    Dir.chdir("acceptance") do
-      rm_f "acceptance-artifacts.tar.gz"
-      sh "tar -czv --exclude .bundle -f acceptance-artifacts.tar.gz *"
-    end
+    rm_f "acceptance/acceptance-artifacts.tar.gz"
+    sh "tar -czv --exclude acceptance/.bundle -f acceptance-artifacts.tar.gz acceptance schema"
   end
 
   task :tag_creator do

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git