From 38e8e7b31b1b9deb39019ef8a1607d494022fab3 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 19 Dec 2016 10:41:47 +0100
Subject: git subrepo pull files/puppet/modules/pixelated

subrepo:
  subdir:   "files/puppet/modules/pixelated"
  merged:   "21f0340"
upstream:
  origin:   "https://github.com/pixelated/puppet-pixelated.git"
  branch:   "master"
  commit:   "21f0340"
git-subrepo:
  version:  "0.3.0"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "841aa43"
---
 files/puppet/modules/pixelated/manifests/agent.pp |  5 ++++-
 files/puppet/modules/pixelated/manifests/apt.pp   |  2 +-
 files/puppet/modules/pixelated/manifests/tests.pp | 22 ++++++++++++++++++----
 3 files changed, 23 insertions(+), 6 deletions(-)

(limited to 'files/puppet/modules/pixelated/manifests')

diff --git a/files/puppet/modules/pixelated/manifests/agent.pp b/files/puppet/modules/pixelated/manifests/agent.pp
index c689799..cdcdfd9 100644
--- a/files/puppet/modules/pixelated/manifests/agent.pp
+++ b/files/puppet/modules/pixelated/manifests/agent.pp
@@ -17,7 +17,10 @@ class pixelated::agent {
 
   service { 'pixelated-server':
     ensure  => running,
-    require => Package['pixelated-server'],
+    require => [
+      Package['pixelated-server'],
+      Service['apache']
+    ]
   }
 
   file { $default_file:
diff --git a/files/puppet/modules/pixelated/manifests/apt.pp b/files/puppet/modules/pixelated/manifests/apt.pp
index 2de5112..b96afbf 100644
--- a/files/puppet/modules/pixelated/manifests/apt.pp
+++ b/files/puppet/modules/pixelated/manifests/apt.pp
@@ -4,7 +4,7 @@ class pixelated::apt {
   include apt
 
   apt::sources_list { 'pixelated.list':
-    content => "deb [arch=amd64] http://packages.pixelated-project.org/debian ${::lsbdistcodename}-snapshots main\ndeb [arch=amd64] http://packages.pixelated-project.org/debian ${::lsbdistcodename} main\n",
+    content => "deb [arch=amd64] http://packages.pixelated-project.org/debian ${::lsbdistcodename} main\n",
     require => Exec[add_pixelated_key],
     notify  => Exec[refresh_apt],
   }
diff --git a/files/puppet/modules/pixelated/manifests/tests.pp b/files/puppet/modules/pixelated/manifests/tests.pp
index a0264ae..4c04a27 100644
--- a/files/puppet/modules/pixelated/manifests/tests.pp
+++ b/files/puppet/modules/pixelated/manifests/tests.pp
@@ -29,26 +29,40 @@ class pixelated::tests {
     require  => Package['python-pip'],
   }
 
- file{'/usr/local/bin/phantomjs':
+  file{'/usr/local/bin/phantomjs':
     source => 'puppet:///modules/pixelated/phantomjs',
     owner  => 'root',
     group  => 'root',
-    mode   => '0755',
+    mode   => '0755'
   }
- 
+
   file{'/srv/leap/tests_custom/functional-tests':
     ensure  => directory,
     recurse => true,
     purge   => true,
+    ignore  => '*.pyc',
     source  => 'puppet:///modules/pixelated/functional-tests',
   }
+
   cron {'run_functional_tests':
-    command     => "(date; INVITE_CODE_ENABLED=$invite /usr/bin/mk-job pixelated-functional-tests /usr/local/bin/behave --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/) >> /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'],
   }
+
+  # You can remove this after january/2017
+  cron {'run_smoke_tests':
+    ensure  => absent,
+  }
+
+  # You can remove this after january/2017
+  file {'remove_smoke_tests_on_checkmk_folder':
+    ensure => absent,
+    path   => '/var/lib/check_mk_agent/job/root/pixelated-smoke-tests'
+  }
+
   exec {'dummy_register_job':
     command     => '/usr/bin/mk-job pixelated-functional-tests /bin/true',
     require     => Class['::check_mk::agent::install'],
-- 
cgit v1.2.3