Merge "Added horizon-mirantis-theme build for ocata, fixes"
diff --git a/jenkins/client/job/debian/packages/horizon/themes.yml b/jenkins/client/job/debian/packages/horizon/themes.yml
index a5ad56a..a26977f 100644
--- a/jenkins/client/job/debian/packages/horizon/themes.yml
+++ b/jenkins/client/job/debian/packages/horizon/themes.yml
@@ -10,13 +10,25 @@
os: ubuntu
dist: trusty
os_version: mitaka
- branch: master
+ branch: stable/mitaka
# Xenial
- name: horizon-mirantis-theme
os: ubuntu
dist: xenial
os_version: mitaka
- branch: master
+ branch: stable/mitaka
+ # Trusty
+ - name: horizon-mirantis-theme
+ os: ubuntu
+ dist: trusty
+ os_version: ocata
+ branch: stable/ocata
+ # Xenial
+ - name: horizon-mirantis-theme
+ os: ubuntu
+ dist: xenial
+ os_version: ocata
+ branch: stable/ocata
template:
discard:
build:
diff --git a/jenkins/client/job/deploy/lab/cicd.yml b/jenkins/client/job/deploy/lab/cicd.yml
index 7f53d29..4fcc6d5 100644
--- a/jenkins/client/job/deploy/lab/cicd.yml
+++ b/jenkins/client/job/deploy/lab/cicd.yml
@@ -18,21 +18,33 @@
script: cicd-lab-pipeline.groovy
param:
# heat
- HEAT_TEMPLATE_URL:
+ STACK_TEMPLATE_URL:
type: string
default: "git@github.com:Mirantis/mk-lab-heat-templates.git"
- 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: "Delete heat stack at the end of job"
+ STACK_REUSE:
+ type: boolean
+ default: 'false'
+ description: "Reuse existing stack and only orchestrate deployment"
+ STACK_CLEANUP_JOB:
+ type: string
+ default: 'deploy-heat-cleanup'
+
HEAT_STACK_ENVIRONMENT:
type: string
default: "tcpisek"
@@ -42,14 +54,6 @@
HEAT_STACK_PUBLIC_NET:
type: string
default: "mirantis-private"
- HEAT_STACK_DELETE:
- type: boolean
- default: 'true'
- description: "Delete heat stack at the end of job"
- HEAT_STACK_REUSE:
- type: boolean
- default: 'false'
- description: "Reuse existing stack and only orchestrate deployment"
# salt master
SALT_MASTER_CREDENTIALS:
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 69a0f9b..0f3b405 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -153,3 +153,6 @@
DEFAULT_GIT_REF:
type: string
default: master
+ KITCHEN_TESTS_PARALLEL:
+ type: boolean
+ default: 'false'