Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/282365
Change subject: dib: split apt conf to its own step
......................................................................
dib: split apt conf to its own step
To be able to force apt-get update after apt configuration has been
provisionned, move it to aptconf.pp
Change-Id: Ib0f340ec455ae741e5a72293df9c8d783eb03536
---
M dib/elements/wikimedia/README.rst
M dib/elements/wikimedia/install.d/05-puppet
A dib/puppet/aptconf.pp
M dib/puppet/ciimage.pp
M nodepool/scripts/setup_node.sh
5 files changed, 22 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/65/282365/1
diff --git a/dib/elements/wikimedia/README.rst
b/dib/elements/wikimedia/README.rst
index ee23b6c..47628b1 100644
--- a/dib/elements/wikimedia/README.rst
+++ b/dib/elements/wikimedia/README.rst
@@ -2,6 +2,9 @@
Based on OpenStack 'puppet' element.
-DIB_WIKIMEDIA_PUPPET_SOURCE directory holding puppet manifests. First apply
-'bootstrap.pp' then 'ciimage.pp'
+DIB_WIKIMEDIA_PUPPET_SOURCE directory holding puppet manifests. Applies:
+'bootstrap.pp' to setup hiera
+'aptconf.pp' for apt configuration
+'ciimage.pp' which hold the rest of puppet
+
DIB_WIKIMEDIA_PUPPET_DEST directory in the image. Default: /puppet
diff --git a/dib/elements/wikimedia/install.d/05-puppet
b/dib/elements/wikimedia/install.d/05-puppet
index 167fb6a..145161d 100755
--- a/dib/elements/wikimedia/install.d/05-puppet
+++ b/dib/elements/wikimedia/install.d/05-puppet
@@ -29,6 +29,8 @@
echo "Applying puppet manifests ..."
puppet-apply /tmp/in_target.d/wikimedia-puppet/bootstrap.pp
+puppet-apply /tmp/in_target.d/wikimedia-puppet/aptconf.pp
+apt-get -q update
puppet-apply /tmp/in_target.d/wikimedia-puppet/ciimage.pp
echo "Performing apt-get dist-upgrade"
diff --git a/dib/puppet/aptconf.pp b/dib/puppet/aptconf.pp
new file mode 100644
index 0000000..5acdad3
--- /dev/null
+++ b/dib/puppet/aptconf.pp
@@ -0,0 +1,4 @@
+$realm = 'labs'
+$labsproject = 'contintcloud'
+
+class { '::apt': }
diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index 89d9715..2c671ed 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -5,20 +5,7 @@
$realm = 'labs'
$labsproject = 'contintcloud'
-# Needs ::apt first so we get jessie-wikimedia and jessie-backports configured
-# and pinned. Else our packages are not up-to-date / not found.
-stage { 'first':
- before => Stage['main'],
-}
-class { '::apt':
- stage => first,
-}
-exec { 'force run apt-get update':
- stage => first,
- cwd => '/bin/true',
- notify => Exec['apt-get update'],
- require => Class['::apt'],
-}
+# Should have run aptconf.pp first.
# Jenkins provision jre by itself but it sounds better to have it already in
# the image. T126246.
diff --git a/nodepool/scripts/setup_node.sh b/nodepool/scripts/setup_node.sh
index 97ecb52..928ca0d 100755
--- a/nodepool/scripts/setup_node.sh
+++ b/nodepool/scripts/setup_node.sh
@@ -23,12 +23,20 @@
sudo git -C "/opt/git/${CI_CONFIG}" remote set-url origin
"https://gerrit.wikimedia.org/r/p/${CI_CONFIG}.git";
sudo git -C "/opt/git/${CI_CONFIG}" pull
-echo "Running puppet"
+echo "Refresh /puppet repo"
sudo git -C /puppet pull
+
+echo "Setting up apt configuration"
+# Needs ::apt first so we get jessie-wikimedia and jessie-backports configured
+# and pinned. Else our packages are not up-to-date / not found.
+sudo /usr/local/bin/puppet-apply
/opt/git/integration/config/dib/puppet/aptconf.pp
+echo "apt-get update and dist-upgrade"
+sudo apt-get -q update
+
+echo "Running puppet"
sudo /usr/local/bin/puppet-apply
/opt/git/integration/config/dib/puppet/ciimage.pp
echo "apt-get dist-upgrade && clean"
-sudo apt-get -q update
sudo apt-get -V -q -y dist-upgrade
sudo apt-get clean
--
To view, visit https://gerrit.wikimedia.org/r/282365
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0f340ec455ae741e5a72293df9c8d783eb03536
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
