opendev/system-config
Code Issues Proposed changes

Merge "Groups-dev distbuild checked wrong Git repository commit hash"

Browse Source
This commit is contained in:
Jenkins 2013-09-23 21:43:14 +00:00 committed by Gerrit Code Review
commit d4fefa8034
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/drupal/manifests/distbuild.pp
View File

@ -53,15 +53,15 @@ define drupal::distbuild (
timeout => 900, timeout => 900,
cwd => "${site_sandbox_root}/${$site_build_repo_name}", cwd => "${site_sandbox_root}/${$site_build_repo_name}",
command => "rm -rf ${site_staging_root}/${site_staging_tarball} && drush make --tar ${site_makefile} ${site_staging_root}/${site_staging_tarball}", command => "rm -rf ${site_staging_root}/${site_staging_tarball} && drush make --tar ${site_makefile} ${site_staging_root}/${site_staging_tarball}",
unless => "diff ${site_sandbox_root}/${$site_build_repo_name}/.git/packed-refs ${site_build_flagfile}", unless => "diff ${site_sandbox_root}/${$site_build_repo_name}/.git/refs/heads/master ${site_build_flagfile}",
require => File[$site_staging_root], require => File[$site_staging_root],
subscribe => Vcsrepo["${site_sandbox_root}/${$site_build_repo_name}"], subscribe => Vcsrepo["${site_sandbox_root}/${$site_build_repo_name}"],
} }
exec { 'drupal-build-dist-post': exec { 'drupal-build-dist-post':
path => '/usr/bin:/bin', path => '/usr/bin:/bin',
command => "cp ${site_sandbox_root}/${$site_build_repo_name}/.git/packed-refs ${site_build_flagfile} && rm -rf ${site_deploy_flagfile}", command => "cp ${site_sandbox_root}/${$site_build_repo_name}/.git/refs/heads/master ${site_build_flagfile} && rm -rf ${site_deploy_flagfile}",
unless => "diff ${site_sandbox_root}/${$site_build_repo_name}/.git/packed-refs ${site_build_flagfile}", unless => "diff ${site_sandbox_root}/${$site_build_repo_name}/.git/refs/heads/master ${site_build_flagfile}",
subscribe => Vcsrepo["${site_sandbox_root}/${$site_build_repo_name}"], subscribe => Vcsrepo["${site_sandbox_root}/${$site_build_repo_name}"],
require => Exec['drupal-build-dist'], require => Exec['drupal-build-dist'],
} }