switch jobs to cloud-deploy pipeline
Change-Id: I55c2e4753046bfc8c6a8b6d4a8f77fc92706bb47
diff --git a/jenkins/client/job/deploy/lab/mk/cloud.yml b/jenkins/client/job/deploy/lab/mk/cloud.yml
index 81e2121..d0ae383 100644
--- a/jenkins/client/job/deploy/lab/mk/cloud.yml
+++ b/jenkins/client/job/deploy/lab/mk/cloud.yml
@@ -113,9 +113,6 @@
STACK_NAME:
type: string
description: Heat stack name. Will be generated if missing.
- STACK_TEMPLATE:
- type: string
- default: "{{stack_name}}"
STACK_TYPE:
type: string
default: "{{stack_type}}"
@@ -125,17 +122,20 @@
STACK_TEST:
type: string
default: "{{stack_test}}"
+ STACK_REUSE:
+ type: boolean
+ default: 'false'
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'
STACK_COMPUTE_COUNT:
type: string
default: '2'
+ STACK_TEMPLATE:
+ type: string
+ default: "{{stack_name}}"
STACK_TEMPLATE_URL:
type: string
default: "${_param:jenkins_gerrit_url}/mk/heat-templates"
@@ -149,7 +149,7 @@
type: string
default: 'deploy-stack-cleanup'
- # salt master
+ # salt
SALT_MASTER_CREDENTIALS:
type: string
default: "salt-qa-credentials"
@@ -159,6 +159,7 @@
SALT_OVERRIDES:
type: text
default: ""
+ description: "YAML with overrides for Salt deployment"
# aws api
AWS_STACK_REGION:
@@ -171,36 +172,6 @@
type: string
default: "jenkins-mk"
-
- # openstack api
- OPENSTACK_API_URL:
- type: string
- default: "https://cloud-cz.bud.mirantis.net:5000"
- OPENSTACK_API_CREDENTIALS:
- type: string
- default: "openstack-devcloud-credentials"
- OPENSTACK_API_PROJECT:
- type: string
- default: "mcp-mk"
- OPENSTACK_API_CLIENT:
- type: string
- default: ""
- OPENSTACK_API_VERSION:
- type: string
- default: "3"
- OPENSTACK_API_PROJECT_DOMAIN:
- type: string
- default: "default"
- OPENSTACK_API_USER_DOMAIN_ID:
- type: string
- default: "default"
- OPENSTACK_API_PROJECT_ID:
- type: string
- default: ""
- OPENSTACK_API_USER_DOMAIN:
- type: string
- default: "default"
-
# heat
HEAT_STACK_ENVIRONMENT:
type: string
@@ -212,7 +183,34 @@
type: string
default: "public"
- # k8s setttings
+ # openstack api
+ OPENSTACK_API_URL:
+ type: string
+ default: "https://cloud-cz.bud.mirantis.net:5000"
+ OPENSTACK_API_CREDENTIALS:
+ type: string
+ default: "openstack-devcloud-credentials"
+ OPENSTACK_API_PROJECT:
+ type: string
+ default: "mcp-mk"
+ OPENSTACK_API_PROJECT_DOMAIN:
+ type: string
+ default: ""
+ OPENSTACK_API_PROJECT_ID:
+ type: string
+ default: ""
+ OPENSTACK_API_USER_DOMAIN:
+ type: string
+ default: "default"
+
+ OPENSTACK_API_CLIENT:
+ type: string
+ default: ""
+ OPENSTACK_API_VERSION:
+ type: string
+ default: "3"
+
+ # test
TEST_K8S_API_SERVER:
type: string
default: "http://127.0.0.1:8080"
@@ -220,8 +218,20 @@
type: string
default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.5.1-3_1482332392819"
- # openstack settings
TEST_TEMPEST_IMAGE:
type: string
+ description: "Tempest docker image"
default: "sandbox-docker-prod-local.docker.mirantis.net/mirantis/rally_tempest:0.1"
+ TEST_TEMPEST_TARGET:
+ type: string
+ description: "Node to run tests"
+ default: ""
+ TEST_DOCKER_INSTALL:
+ type: boolean
+ description: "Install docker on the target if true"
+ default: "true"
+ TEST_TEMPEST_PATTERN:
+ type: string
+ description: "Run tests matched to pattern only"
+ default: ""
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index b25fd03..bf51197 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -18,12 +18,20 @@
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
credentials: "gerrit"
- script: lab-pipeline.groovy
+ script: cloud-deploy-pipeline.groovy
trigger:
timer:
spec: "{{timer}}"
param:
- # deployments and test settings
+ # general parameters
+ ASK_ON_ERROR:
+ type: boolean
+ default: 'false'
+
+ # deployments
+ STACK_NAME:
+ type: string
+ description: Heat stack name. Will be generated if missing.
STACK_TYPE:
type: string
default: "{{stack_type}}"
@@ -33,7 +41,20 @@
STACK_TEST:
type: string
default: "{{test}}"
+ STACK_REUSE:
+ type: boolean
+ default: 'false'
+ STACK_DELETE:
+ type: boolean
+ default: 'true'
+ description: "Don't enable it if you need to use the lab after"
+ STACK_COMPUTE_COUNT:
+ type: string
+ default: '2'
+ STACK_TEMPLATE:
+ type: string
+ default: "{{lab}}"
STACK_TEMPLATE_URL:
type: string
default: "${_param:jenkins_gerrit_url}/mk/heat-templates"
@@ -43,34 +64,11 @@
STACK_TEMPLATE_BRANCH:
type: string
default: "master"
- STACK_NAME:
- type: string
- description: Heat stack name. Will be generated if missing.
- 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'
STACK_CLEANUP_JOB:
type: string
default: 'deploy-stack-cleanup'
- # heat
- HEAT_STACK_ENVIRONMENT:
- type: string
- default: "devcloud"
- HEAT_STACK_ZONE:
- type: string
- default: "mcp-mk"
- HEAT_STACK_PUBLIC_NET:
- type: string
- default: "public"
- # salt master
+ # salt
SALT_MASTER_CREDENTIALS:
type: string
default: "salt-qa-credentials"
@@ -82,6 +80,28 @@
default: ""
description: "YAML with overrides for Salt deployment"
+ # aws api
+ AWS_STACK_REGION:
+ type: string
+ default: "us-west-2"
+ AWS_API_CREDENTIALS:
+ type: string
+ default: "aws-credentials"
+ AWS_SSH_KEY:
+ type: string
+ default: "jenkins-mk"
+
+ # heat
+ HEAT_STACK_ENVIRONMENT:
+ type: string
+ default: "devcloud"
+ HEAT_STACK_ZONE:
+ type: string
+ default: "mcp-mk"
+ HEAT_STACK_PUBLIC_NET:
+ type: string
+ default: "public"
+
# openstack api
OPENSTACK_API_URL:
type: string
@@ -92,24 +112,22 @@
OPENSTACK_API_PROJECT:
type: string
default: "mcp-mk"
+ OPENSTACK_API_PROJECT_DOMAIN:
+ type: string
+ default: ""
+ OPENSTACK_API_PROJECT_ID:
+ type: string
+ default: ""
+ OPENSTACK_API_USER_DOMAIN:
+ type: string
+ default: "default"
+
OPENSTACK_API_CLIENT:
type: string
default: ""
OPENSTACK_API_VERSION:
type: string
default: "3"
- OPENSTACK_API_PROJECT_DOMAIN:
- type: string
- default: "default"
- OPENSTACK_API_PROJECT_ID:
- type: string
- default: ""
- OPENSTACK_USER_DOMAIN:
- type: string
- default: "default"
- OPENSTACK_API_USER_DOMAIN:
- type: string
- default: "default"
# k8s setttings
TEST_K8S_API_SERVER:
@@ -137,7 +155,3 @@
description: "Run tests matched to pattern only"
default: ""
- ASK_ON_ERROR:
- type: boolean
- default: 'false'
-