Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365577 )
Change subject: Add base to make_diff
......................................................................
Add base to make_diff
Failing to do so makes diffs with the future worker fail
Change-Id: Ibddcae8e7895be21bc3344f94d46b87d6d1d53d0
---
M puppet_compiler/tests/test_hostworker.py
M puppet_compiler/worker.py
M setup.py
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet_compiler/tests/test_hostworker.py
b/puppet_compiler/tests/test_hostworker.py
index 77c6a81..3114d45 100644
--- a/puppet_compiler/tests/test_hostworker.py
+++ b/puppet_compiler/tests/test_hostworker.py
@@ -63,7 +63,7 @@
mocker.return_value = True
self.hw._get_diff = mock.Mock(return_value=True)
retval = self.hw._make_diff()
- mocker.assert_called_with('change', 'test.example.com')
+ mocker.assert_called_with('change', 'test.example.com', base='prod')
self.assertEquals(retval, True)
self.hw._get_diff = mock.Mock(return_value=False)
self.assertEquals(self.hw._make_diff(), None)
diff --git a/puppet_compiler/worker.py b/puppet_compiler/worker.py
index 192b9c3..efb8794 100644
--- a/puppet_compiler/worker.py
+++ b/puppet_compiler/worker.py
@@ -115,7 +115,7 @@
# Both nodes compiled correctly
_log.info("Calculating diffs for %s", self.hostname)
try:
- puppet.diff(self._envs[1], self.hostname)
+ puppet.diff(self._envs[1], self.hostname, base=self._envs[0])
except subprocess.CalledProcessError as e:
_log.error("Diffing the catalogs failed: %s", self.hostname)
_log.info("Diffing exited with code %d", e.returncode)
diff --git a/setup.py b/setup.py
index 8468942..83484ff 100755
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
setup(
name='puppet_compiler',
- version='0.2.0',
+ version='0.2.1',
description='Tools to compile puppet catalogs as a service',
author='Joe',
author_email='glavage...@wikimedia.org',
--
To view, visit https://gerrit.wikimedia.org/r/365577
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibddcae8e7895be21bc3344f94d46b87d6d1d53d0
Gerrit-PatchSet: 2
Gerrit-Project: operations/software/puppet-compiler
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
