Fixed sudo access for jenkins user, fixed timer definitions in virtual stacks
Change-Id: I75fbfd6aa7ffff3ff7ab83a42850eb798c363a66
diff --git a/jenkins/client/job/deploy/lab/mk/virtual.yml b/jenkins/client/job/deploy/lab/mk/virtual.yml
index 35b8de6..337d93d 100644
--- a/jenkins/client/job/deploy/lab/mk/virtual.yml
+++ b/jenkins/client/job/deploy/lab/mk/virtual.yml
@@ -19,6 +19,7 @@
install: core,openstack
stack_type: heat
test: openstack
+ timer: ""
- lab: virtual_mk22_basic
install: core,openstack
stack_type: heat
@@ -29,6 +30,7 @@
install: core,openstack,dvr
stack_type: heat
test: openstack
+ timer: ""
- lab: virtual_mcp05_ovs
install: core,openstack,ovs
stack_type: heat
diff --git a/jenkins/master/config.yml b/jenkins/master/config.yml
index 795b748..41e3ffb 100644
--- a/jenkins/master/config.yml
+++ b/jenkins/master/config.yml
@@ -8,11 +8,4 @@
pillar:
jenkins:
master:
- home: /srv/volumes/jenkins
- sudo:
- users:
- jenkins:
- hosts:
- - ALL
- commands:
- - docker
\ No newline at end of file
+ home: /srv/volumes/jenkins
\ No newline at end of file
diff --git a/jenkins/slave/docker.yml b/jenkins/slave/docker.yml
index b134225..b1356f0 100644
--- a/jenkins/slave/docker.yml
+++ b/jenkins/slave/docker.yml
@@ -7,3 +7,10 @@
jenkins:
groups:
- docker
+ sudo:
+ users:
+ jenkins:
+ hosts:
+ - ALL
+ commands:
+ - docker
\ No newline at end of file