Merge "Disable parallelism for salt models testing"
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index ecd7432..0eec086 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -189,6 +189,8 @@
dist: trusty
- name: varnish
dist: trusty
+ - name: xtrabackup
+ dist: trusty
- name: zookeeper
dist: trusty
- name: aodh
@@ -375,6 +377,8 @@
dist: xenial
- name: varnish
dist: xenial
+ - name: xtrabackup
+ dist: xenial
- name: zookeeper
dist: xenial
template:
diff --git a/jenkins/client/job/deploy/lab/mk/cleanup.yml b/jenkins/client/job/deploy/lab/mk/cleanup.yml
index d11b691..687e1f3 100644
--- a/jenkins/client/job/deploy/lab/mk/cleanup.yml
+++ b/jenkins/client/job/deploy/lab/mk/cleanup.yml
@@ -2,10 +2,10 @@
jenkins:
client:
job:
- deploy-heat-cleanup:
+ deploy-stack-cleanup:
type: workflow-scm
concurrent: true
- display_name: "Deploy - heat cleanup"
+ display_name: "Deploy - stack cleanup"
discard:
build:
keep_num: 20
@@ -15,7 +15,18 @@
credentials: "gerrit"
script: cleanup-pipeline.groovy
param:
- # openstack api
+ # general parameters
+ STACK_NAME:
+ type: string
+ description: This stack will be deleted.
+ STACK_TYPE:
+ type: choice
+ choices:
+ - heat
+ - aws
+ default: 'heat'
+
+ # heat parameters
OPENSTACK_API_URL:
type: string
default: "https://vpc.tcpisek.cz:5000"
@@ -37,10 +48,15 @@
OPENSTACK_API_USER_DOMAIN_ID:
type: string
default: "default"
- # heat
- HEAT_STACK_NAME:
+
+ # aws parameters
+ AWS_API_CREDENTIALS:
type: string
- description: This stack will be deleted.
+ default: "aws-credentials"
+ AWS_DEFAULT_REGION:
+ type: string
+ default: "us-west-2"
+
delete-failed-stacks:
type: workflow-scm
concurrent: true
diff --git a/jenkins/client/job/deploy/lab/mk/cloud.yml b/jenkins/client/job/deploy/lab/mk/cloud.yml
index d15933e..32542ca 100644
--- a/jenkins/client/job/deploy/lab/mk/cloud.yml
+++ b/jenkins/client/job/deploy/lab/mk/cloud.yml
@@ -3,12 +3,12 @@
jenkins_cloud_deploy_pipelines:
- stack_name: k8s_calico
stack_type: heat
- stack_install: core,k8s
+ stack_install: core,k8s,calico
job_timer: ""
- stack_name: k8s_calico
stack_type: aws
- stack_install: core,k8s
- job_timer: ""
+ stack_install: core,k8s,calico
+ job_timer: "H H * * *"
jenkins:
client:
job_template:
@@ -21,7 +21,7 @@
build:
keep_num: 20
concurrent: true
- display_name: "Deploy {{stack_type}} {{stack_name}} stack"
+ display_name: "Deploy - {{stack_name}} {{stack_type}}"
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
@@ -31,7 +31,12 @@
timer:
spec: "{{job_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.
@@ -66,7 +71,7 @@
default: "master"
STACK_CLEANUP_JOB:
type: string
- default: ''
+ default: 'deploy-stack-cleanup'
# salt master
SALT_MASTER_CREDENTIALS:
@@ -130,12 +135,8 @@
type: string
default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.5.1-3_1482332392819"
- # Tempest settings
- TEMPEST_IMAGE_LINK:
+ # Openstack settings
+ TEMPEST_IMAGE:
type: string
default: "sandbox-docker-prod-local.docker.mirantis.net/mirantis/rally_tempest:0.1"
- ASK_ON_ERROR:
- type: boolean
- default: 'false'
-
diff --git a/jenkins/client/job/docker/devops-portal.yml b/jenkins/client/job/docker/devops-portal.yml
index 7af37eb..399586f 100644
--- a/jenkins/client/job/docker/devops-portal.yml
+++ b/jenkins/client/job/docker/devops-portal.yml
@@ -40,7 +40,7 @@
param:
IMAGE_NAME:
type: string
- default: "devops_portal"
+ default: "devops-portal"
IMAGE_TAGS:
type: string
default: ""
diff --git a/jenkins/client/job/docker/rundeck.yml b/jenkins/client/job/docker/rundeck.yml
new file mode 100644
index 0000000..63d206f
--- /dev/null
+++ b/jenkins/client/job/docker/rundeck.yml
@@ -0,0 +1,58 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ docker-build-images-rundeck:
+ name: docker-build-images-rundeck
+ discard:
+ build:
+ keep_num: 25
+ artifact:
+ keep_num: 25
+ type: workflow-scm
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: docker-build-to-jfrog.groovy
+ trigger:
+ gerrit:
+ project:
+ "oss/docker-rundeck":
+ branches:
+ - master
+ skip_vote:
+ - successful
+ - failed
+ - unstable
+ - not_built
+ event:
+ patchset:
+ - created:
+ excludeDrafts: false
+ excludeNoCodeChange: false
+ change:
+ - merged
+ comment:
+ - addedContains:
+ commentAddedCommentContains: 'rebuild'
+ param:
+ IMAGE_NAME:
+ type: string
+ default: "rundeck"
+ IMAGE_TAGS:
+ type: string
+ default: ""
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ DOCKERFILE_PATH:
+ type: string
+ default: "."
+ DOCKER_REGISTRY:
+ type: string
+ default: "docker-dev-virtual.docker.mirantis.net"
+ PROJECT_NAMESPACE:
+ type: string
+ default: "oss"
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index 1716a44..3869b4a 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -106,6 +106,7 @@
- name: taiga
- name: telegraf
- name: varnish
+ - name: xtrabackup
- name: zookeeper
template:
discard:
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 0f3b405..1e51afb 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -107,6 +107,7 @@
- name: telegraf
- name: tftpd-hpa
- name: varnish
+ - name: xtrabackup
- name: zookeeper
template:
discard:
diff --git a/jenkins/client/job/test_devops_portal.yml b/jenkins/client/job/test_devops_portal.yml
index 5cf4c79..abe2a36 100644
--- a/jenkins/client/job/test_devops_portal.yml
+++ b/jenkins/client/job/test_devops_portal.yml
@@ -46,6 +46,7 @@
default: |
npm run lint
npm run test:unit
+ npm run test:functional
DEFAULT_GIT_URL:
type: string
default: "${_param:jenkins_gerrit_url}/oss/devops-portal"
diff --git a/xtrabackup/client/single.yml b/xtrabackup/client/single.yml
new file mode 100644
index 0000000..cbe1123
--- /dev/null
+++ b/xtrabackup/client/single.yml
@@ -0,0 +1,3 @@
+classes:
+- service.xtrabackup.client.single
+- system.openssh.client.root
\ No newline at end of file
diff --git a/xtrabackup/server/single.yml b/xtrabackup/server/single.yml
new file mode 100644
index 0000000..d1d54fd
--- /dev/null
+++ b/xtrabackup/server/single.yml
@@ -0,0 +1,2 @@
+classes:
+- service.xtrabackup.server.single