Renamed arguments of lab pipeline, added horizon-lbaasv2-panels build job
Change-Id: I5bdc9b8c775fca37c0ca6def7fa132ba541a13cf
diff --git a/jenkins/client/job/debian/packages/horizon/modules.yml b/jenkins/client/job/debian/packages/horizon/modules.yml
index bc83fe4..4297071 100644
--- a/jenkins/client/job/debian/packages/horizon/modules.yml
+++ b/jenkins/client/job/debian/packages/horizon/modules.yml
@@ -6,6 +6,18 @@
name: build-debian-horizon-module-{{name}}-{{os_version}}-{{os}}-{{dist}}
jobs:
# Trusty
+ - name: horizon-neutron-lbaasv2-panel
+ os: ubuntu
+ dist: trusty
+ os_version: ocata
+ branch: stable/ocata
+ # Xenial
+ - name: horizon-neutron-lbaasv2-panel
+ os: ubuntu
+ dist: xenial
+ os_version: ocata
+ branch: stable/ocata
+ # Trusty
- name: horizon-overrides-plugin
os: ubuntu
dist: trusty
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index fba15ef..1d57f5d 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -34,22 +34,30 @@
type: string
default: "{{test}}"
- # heat
- HEAT_TEMPLATE_URL:
+ STACK_TEMPLATE_URL:
type: string
default: "${_param:jenkins_gerrit_url}/mk/heat-templates"
- HEAT_TEMPLATE_CREDENTIALS:
+ STACK_TEMPLATE_CREDENTIALS:
type: string
default: "gerrit"
- HEAT_TEMPLATE_BRANCH:
+ STACK_TEMPLATE_BRANCH:
type: string
default: "master"
- HEAT_STACK_NAME:
+ STACK_NAME:
type: string
description: Heat stack name. Will be generated if missing.
- HEAT_STACK_TEMPLATE:
+ STACK_TEMPLATE:
type: string
default: "{{lab}}"
+ STACK_DELETE:
+ type: boolean
+ default: 'true'
+ description: "Don't enable it if you need to use the lab after"
+ STACK_REUSE:
+ type: boolean
+ default: 'false'
+
+ # heat
HEAT_STACK_ENVIRONMENT:
type: string
default: "tcpisek"
@@ -59,13 +67,6 @@
HEAT_STACK_PUBLIC_NET:
type: string
default: "mirantis-private"
- HEAT_STACK_DELETE:
- type: boolean
- default: 'true'
- description: "Don't enable it if you need to use the lab after"
- HEAT_STACK_REUSE:
- type: boolean
- default: 'false'
# salt master
SALT_MASTER_CREDENTIALS: