summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2017-02-27 11:21:01 +0100
committervarac <varacanero@zeromail.org>2017-02-27 11:21:01 +0100
commit9e57bc42ab5d5abc365a058057da3b54a8975c91 (patch)
tree5e630e18c3800c1a7dc9d54a0975315371ea34ce
parent2d0854bdf212096bbb856072de4cd29f8e1a97c5 (diff)
git subrepo pull files/puppet/modules/pixelated
subrepo: subdir: "files/puppet/modules/pixelated" merged: "0866ce4" upstream: origin: "https://github.com/pixelated/puppet-pixelated.git" branch: "master" commit: "0866ce4" git-subrepo: version: "0.3.1" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "3202adb"
-rw-r--r--files/puppet/modules/pixelated/.gitrepo6
-rw-r--r--files/puppet/modules/pixelated/files/check_mk/user-agent.cfg5
-rw-r--r--files/puppet/modules/pixelated/manifests/tests.pp5
-rw-r--r--files/puppet/modules/pixelated/spec/classes/tests_spec.rb4
4 files changed, 12 insertions, 8 deletions
diff --git a/files/puppet/modules/pixelated/.gitrepo b/files/puppet/modules/pixelated/.gitrepo
index f0e5fa3..220fcc1 100644
--- a/files/puppet/modules/pixelated/.gitrepo
+++ b/files/puppet/modules/pixelated/.gitrepo
@@ -6,6 +6,6 @@
[subrepo]
remote = https://github.com/pixelated/puppet-pixelated.git
branch = master
- commit = 2cc88265cd94199f72f4c562494a3b8d780ac581
- parent = 13ba81c7593e9b16a0f5b6af28cd8d02b0ddbace
- cmdver = 0.3.0
+ commit = 0866ce4dc63c8fec263b9638071f32e087324428
+ parent = 2d0854bdf212096bbb856072de4cd29f8e1a97c5
+ cmdver = 0.3.1
diff --git a/files/puppet/modules/pixelated/files/check_mk/user-agent.cfg b/files/puppet/modules/pixelated/files/check_mk/user-agent.cfg
index 2be8c16..8f8620c 100644
--- a/files/puppet/modules/pixelated/files/check_mk/user-agent.cfg
+++ b/files/puppet/modules/pixelated/files/check_mk/user-agent.cfg
@@ -16,7 +16,10 @@
# issue 975
I Failure instance: Traceback: <class 'leap.bitmask.keymanager.errors.KeyAddressMismatch'>
# issue 981
- I Failed to decrypt: Failed to encrypt/decrypt: [GNUPG:] NODATA 2
+ I Failed to encrypt/decrypt: \[GNUPG:\] NODATA 2
+ I Failure instance: Traceback: <type 'exceptions.ValueError'>: No JSON object could be decoded
+# issue 992
+ I leap.bitmask.keymanager.errors.EncryptError
#
I twisted.internet.error.ConnectionRefusedError: Connection was refused by other side: 111: Connection refused
I twisted.mail.smtp.SMTPDeliveryError
diff --git a/files/puppet/modules/pixelated/manifests/tests.pp b/files/puppet/modules/pixelated/manifests/tests.pp
index 4c04a27..503ed4f 100644
--- a/files/puppet/modules/pixelated/manifests/tests.pp
+++ b/files/puppet/modules/pixelated/manifests/tests.pp
@@ -21,7 +21,7 @@ class pixelated::tests {
mode => '0755',
}
- ensure_packages(['python-pip', 'curl', 'bzip2', 'python-enum','python-pycurl'])
+ ensure_packages(['python-pip', 'curl', 'bzip2', 'python-enum','python-pycurl', 'moreutils'])
package{['behave','selenium']:
ensure => installed,
@@ -45,11 +45,12 @@ class pixelated::tests {
}
cron {'run_functional_tests':
- command => "(date; INVITE_CODE_ENABLED=${invite} /usr/bin/mk-job pixelated-functional-tests /usr/local/bin/behave --stop --tags @staging --tags ~@wip --no-capture -k /srv/leap/tests_custom/functional-tests/) >> /var/log/check_mk_jobs.log 2>&1",
+ command => "(date; INVITE_CODE_ENABLED=${invite} /usr/bin/mk-job pixelated-functional-tests /usr/local/bin/behave --stop --tags @staging --tags ~@wip --no-capture -k /srv/leap/tests_custom/functional-tests/ | ts ) >> /var/log/check_mk_jobs.log 2>&1",
environment => 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
user => 'root',
minute => 27,
notify => Exec['dummy_register_job'],
+ require => Package['moreutils']
}
# You can remove this after january/2017
diff --git a/files/puppet/modules/pixelated/spec/classes/tests_spec.rb b/files/puppet/modules/pixelated/spec/classes/tests_spec.rb
index be69cf2..cc3e9b7 100644
--- a/files/puppet/modules/pixelated/spec/classes/tests_spec.rb
+++ b/files/puppet/modules/pixelated/spec/classes/tests_spec.rb
@@ -12,7 +12,7 @@ describe 'pixelated::tests' do
}
end
- let!(:ensure_packages) { MockFunction.new('ensure_packages',{:type => :statement}) }
+ let!(:ensure_packages) { MockFunction.new('ensure_packages',{:type => :statement}) }
let(:pre_condition) { [
"class stdlib {}",
] }
@@ -40,7 +40,7 @@ describe 'pixelated::tests' do
end
it do
should contain_cron('run_functional_tests').with(
- "command" => """(date; INVITE_CODE_ENABLED=true /usr/bin/mk-job pixelated-functional-tests /usr/local/bin/behave --stop --tags @staging --tags ~@wip --no-capture -k /srv/leap/tests_custom/functional-tests/) >> /var/log/check_mk_jobs.log 2>&1"
+ "command" => """(date; INVITE_CODE_ENABLED=true /usr/bin/mk-job pixelated-functional-tests /usr/local/bin/behave --stop --tags @staging --tags ~@wip --no-capture -k /srv/leap/tests_custom/functional-tests/ | ts ) >> /var/log/check_mk_jobs.log 2>&1"
)
end
end