Merge "Adding VIP and minion:cert classes for barbican"
diff --git a/jenkins/client/job/deploy/lab/component/stacklight.yml b/jenkins/client/job/deploy/lab/component/stacklight.yml
index 2937b9a..d6a4a5f 100644
--- a/jenkins/client/job/deploy/lab/component/stacklight.yml
+++ b/jenkins/client/job/deploy/lab/component/stacklight.yml
@@ -2,26 +2,26 @@
- system.jenkins.client.job.deploy.lab.deploy
parameters:
_param:
+ heat_stack_zone_job_param:
+ type: string
+ default: "mcp-stacklight"
+ openstack_api_projects_job_param:
+ type: string
+ default: "mcp-stacklight"
jenkins_deploy_jobs:
- stack_name: stacklight_k8s_calico
- heat_stack_zone_job_param: "mcp-stacklight"
- openstack_api_projects_job_param: "mcp-stacklight"
stack_env: devcloud
stack_type: heat
stack_install: core,k8s,calico,stacklight
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: stacklight_os_contrail
- heat_stack_zone_job_param: "mcp-stacklight"
- openstack_api_projects_job_param: "mcp-stacklight"
stack_env: devcloud
stack_type: heat
stack_install: core,openstack,contrail,stacklight
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: stacklight_os_ovs
- heat_stack_zone_job_param: "mcp-stacklight"
- openstack_api_projects_job_param: "mcp-stacklight"
stack_env: devcloud
stack_type: heat
stack_install: core,openstack,ovs,stacklight
diff --git a/jenkins/client/job/stacklight/cookiecutter.yml b/jenkins/client/job/stacklight/cookiecutter.yml
index fa97f29..0a2c6ed 100644
--- a/jenkins/client/job/stacklight/cookiecutter.yml
+++ b/jenkins/client/job/stacklight/cookiecutter.yml
@@ -19,6 +19,9 @@
credentials: "gerrit"
branch: 'master'
script: test-cookiecutter-model-pipeline.groovy
+ trigger:
+ timer:
+ spec: "H H(0-3) * * *"
param:
CREDENTIALS_ID:
type: string
@@ -57,5 +60,5 @@
default: 'core,openstack,ovs,stacklight'
STACK_DELETE:
type: boolean
- description: "Delete Heat stack when finished (bool)"
- default: 'false'
+ description: "Delete Heat stack when finished (bool). Don't enable it if you need to use the lab after"
+ default: 'true'