jenkins-bot has submitted this change and it was merged.
Change subject: dib: inject CI slave-scripts
......................................................................
dib: inject CI slave-scripts
We started migrating jobs that depends on the CI slave scripts hosted in
integration/jenkins.git. Add a git::clone in puppet similar to the one
in puppet.git contint::slave_scripts
Doing it it ciimage.pp so image snapshot get the latest version of the
repository, saving us from having to rebuild an image everytime a commit
is made to integration/jenkins.git
Change-Id: I06fc324f2622b96171f50a0d09a33b95577ecd71
---
M dib/puppet/ciimage.pp
1 file changed, 19 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index b91e602..e54e8e9 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -17,6 +17,25 @@
# the image. T126246.
include jenkins::slave::requisites
+# Slave scripts
+exec { 'recursive mkdir of /srv/deployment/integration':
+ command => '/bin/mkdir -p /srv/deployment/integration',
+ creates => '/srv/deployment/integration',
+}
+
+# Inject slave scripts
+#
+# We can't reuse contint::slave_scripts which grab unrelated repositories and
+# symlink composer.
+# This is done via puppet rather than in dib so new snapshot images get
+# slave-scripts refreshed.
+git::clone { 'jenkins CI slave scripts':
+ ensure => 'latest',
+ directory => '/srv/deployment/integration/slave-scripts',
+ origin =>
'https://gerrit.wikimedia.org/r/p/integration/jenkins.git',
+ recurse_submodules => true,
+}
+
include contint::packages::base
include contint::packages::python
include contint::packages::ruby
--
To view, visit https://gerrit.wikimedia.org/r/270735
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I06fc324f2622b96171f50a0d09a33b95577ecd71
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
