Merge "refresh cassandra repo"
diff --git a/jenkins/client/job/decapod/add_mon.yml b/jenkins/client/job/decapod/add_mon.yml
deleted file mode 100644
index 03daed2..0000000
--- a/jenkins/client/job/decapod/add_mon.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
- jenkins:
- client:
- job:
- decapod_add_mon:
- type: workflow-scm
- name: decapod-add_mon
- display_name: "Decapod - add monitors"
- discard:
- build:
- keep_num: 20
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/decapod-pipelines"
- credentials: "gerrit"
- script: add-mon.groovy
- param:
- SALT_MASTER_CREDENTIALS:
- type: string
- default: "salt"
- SALT_MASTER_IP:
- type: string
- default: "${_param:infra_config_address}"
- SALT_MASTER_PORT:
- type: string
- default: "${_param:salt_master_api_port}"
- ASK_ON_ERROR:
- type: boolean
- default: 'false'
\ No newline at end of file
diff --git a/jenkins/client/job/decapod/add_osd.yml b/jenkins/client/job/decapod/add_osd.yml
deleted file mode 100644
index f0a4333..0000000
--- a/jenkins/client/job/decapod/add_osd.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
- jenkins:
- client:
- job:
- decapod_add_osd:
- type: workflow-scm
- name: decapod-add_osd
- display_name: "Decapod - add new osd"
- discard:
- build:
- keep_num: 20
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/decapod-pipelines"
- credentials: "gerrit"
- script: add-osd.groovy
- param:
- SALT_MASTER_CREDENTIALS:
- type: string
- default: "salt"
- SALT_MASTER_IP:
- type: string
- default: "${_param:infra_config_address}"
- SALT_MASTER_PORT:
- type: string
- default: "${_param:salt_master_api_port}"
- ASK_ON_ERROR:
- type: boolean
- default: 'false'
\ No newline at end of file
diff --git a/jenkins/client/job/decapod/cluster.yml b/jenkins/client/job/decapod/cluster.yml
deleted file mode 100644
index cb353a6..0000000
--- a/jenkins/client/job/decapod/cluster.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
- jenkins:
- client:
- job:
- deploy_decapod:
- type: workflow-scm
- name: deploy-decapod
- display_name: "Deploy - Decapod"
- discard:
- build:
- keep_num: 20
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/decapod-pipelines"
- credentials: "gerrit"
- script: decapod-pipeline.groovy
- param:
- SALT_MASTER_CREDENTIALS:
- type: string
- default: "salt"
- SALT_MASTER_IP:
- type: string
- default: "${_param:infra_config_address}"
- SALT_MASTER_PORT:
- type: string
- default: "${_param:salt_master_api_port}"
- ASK_ON_ERROR:
- type: boolean
- default: 'false'
diff --git a/jenkins/client/job/decapod/del_mon.yml b/jenkins/client/job/decapod/del_mon.yml
deleted file mode 100644
index d858431..0000000
--- a/jenkins/client/job/decapod/del_mon.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
- jenkins:
- client:
- job:
- decapod_del_mon:
- type: workflow-scm
- name: decapod-del_mon
- display_name: "Decapod - del monitors"
- discard:
- build:
- keep_num: 20
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/decapod-pipelines"
- credentials: "gerrit"
- script: del-mon.groovy
- param:
- SALT_MASTER_CREDENTIALS:
- type: string
- default: "salt"
- SALT_MASTER_IP:
- type: string
- default: "${_param:infra_config_address}"
- SALT_MASTER_PORT:
- type: string
- default: "${_param:salt_master_api_port}"
- ASK_ON_ERROR:
- type: boolean
- default: 'false'
diff --git a/jenkins/client/job/decapod/del_osd.yml b/jenkins/client/job/decapod/del_osd.yml
deleted file mode 100644
index b432762..0000000
--- a/jenkins/client/job/decapod/del_osd.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
- jenkins:
- client:
- job:
- decapod_del_osd:
- type: workflow-scm
- name: decapod-del_osd
- display_name: "Decapod - del osd"
- discard:
- build:
- keep_num: 20
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/decapod-pipelines"
- credentials: "gerrit"
- script: del-osd.groovy
- param:
- SALT_MASTER_CREDENTIALS:
- type: string
- default: "salt"
- SALT_MASTER_IP:
- type: string
- default: "${_param:infra_config_address}"
- SALT_MASTER_PORT:
- type: string
- default: "${_param:salt_master_api_port}"
- ASK_ON_ERROR:
- type: boolean
- default: 'false'
\ No newline at end of file
diff --git a/jenkins/client/job/decapod/monitoring.yml b/jenkins/client/job/decapod/monitoring.yml
deleted file mode 100644
index ea6a5c2..0000000
--- a/jenkins/client/job/decapod/monitoring.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
- jenkins:
- client:
- job:
- decapod_monitoring:
- type: workflow-scm
- name: decapod-monitoring
- display_name: "Decapod - monitoring"
- discard:
- build:
- keep_num: 20
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/decapod-pipelines"
- credentials: "gerrit"
- script: monitoring.groovy
- param:
- SALT_MASTER_CREDENTIALS:
- type: string
- default: "salt"
- SALT_MASTER_IP:
- type: string
- default: "${_param:infra_config_address}"
- SALT_MASTER_PORT:
- type: string
- default: "${_param:salt_master_api_port}"
- ASK_ON_ERROR:
- type: boolean
- default: 'false'
\ No newline at end of file
diff --git a/jenkins/client/job/deploy/rollout.yml b/jenkins/client/job/deploy/rollout.yml
deleted file mode 100644
index 25b088d..0000000
--- a/jenkins/client/job/deploy/rollout.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-parameters:
- _param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
- jenkins:
- client:
- job:
- deploy_rollout_config_change:
- name: deploy-rollout-config-change
- type: workflow-scm
- discard:
- build:
- keep_num: 20
- concurrent: true
- display_name: "Deploy - Rollout change"
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: rollout-config-change.groovy
- param:
- TST_SALT_MASTER_CREDENTIALS:
- type: string
- TST_SALT_MASTER_URL:
- type: string
- PRD_SALT_MASTER_CREDENTIALS:
- type: string
- PRD_SALT_MASTER_URL:
- type: string
- MODEL_REPO_URL:
- type: string
- MODEL_REPO_CREDENTIALS:
- type: string
- default: "gerrit"
- MODEL_REPO_SOURCE_BRANCH:
- type: string
- MODEL_REPO_TARGET_BRANCH:
- type: string
- TARGET_SERVERS:
- type: string
- TARGET_STATES:
- type: string
- TARGET_SUBSET_TEST:
- type: string
- TARGET_SUBSET_LIVE:
- type: string
- TARGET_BATCH_LIVE:
- type: string
- # test
- TEST_SERVICE:
- type: string
- TEST_K8S_API_SERVER:
- type: string
- default: "http://127.0.0.1:8080"
- TEST_K8S_CONFORMANCE_IMAGE:
- type: string
- default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.5-2_1504192939316"
- TEST_TEMPEST_IMAGE:
- type: string
- description: "Tempest docker image"
- default: "${_param:mcp_docker_registry}/mirantis/oscore/rally-tempest"
- 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"
- git_merge_branches:
- name: git-merge-branches
- type: workflow-scm
- discard:
- build:
- keep_num: 20
- concurrent: true
- display_name: "Git - Merge branches"
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: git-merge-branches-pipeline.groovy
- param:
- REPO_URL:
- type: string
- CREDENTIALS_ID:
- type: string
- default: "gerrit"
- SOURCE_BRANCH:
- type: string
- TARGET_BRANCH:
- type: string
diff --git a/jenkins/client/job/deploy/test.yml b/jenkins/client/job/deploy/test.yml
deleted file mode 100644
index cad8ed4..0000000
--- a/jenkins/client/job/deploy/test.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-parameters:
- _param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
- jenkins:
- client:
- job:
- test_service_job:
- name: deploy-test-service
- type: workflow-scm
- discard:
- build:
- keep_num: 50
- concurrent: true
- display_name: "Deploy - Test services in environment"
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: test-service.groovy
- param:
-
- # salt
- SALT_MASTER_CREDENTIALS:
- type: string
- default: "salt-qa-credentials"
- SALT_MASTER_URL:
- type: string
- default: ""
-
- # test
- TEST_K8S_API_SERVER:
- type: string
- default: "http://127.0.0.1:8080"
- TEST_K8S_CONFORMANCE_IMAGE:
- type: string
- default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.5-2_1504192939316"
-
- TEST_TEMPEST_IMAGE:
- type: string
- description: "Tempest docker image"
- default: "${_param:mcp_docker_registry}/mirantis/oscore/rally-tempest"
- TEST_TEMPEST_TARGET:
- type: string
- description: "Node to run tests. use FQDN for ctl01 e.g. ctl01.deploy-heat-os_ha_contrail-17.bud-mk.local"
- 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 e.g. tempest.api.identity"
- default: "false"
- TEST_SERVICE:
- type: string
- description: "openstack or k8s"
- default: "openstack"
- TEST_JUNIT_RATIO:
- type: string
- description: "The amplification factor to apply to test failures when computing the test result contribution to the build health score."
- default: "1.0"
diff --git a/jenkins/client/job/stacklight/cookiecutter.yml b/jenkins/client/job/stacklight/cookiecutter.yml
new file mode 100644
index 0000000..0ef4b5b
--- /dev/null
+++ b/jenkins/client/job/stacklight/cookiecutter.yml
@@ -0,0 +1,61 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ stacklight-test-cookiecutter-model:
+ display_name: stacklight-test-cookiecutter-model
+ name: stacklight-test-cookiecutter-model
+ concurrent: true
+ description: Test specified cookiecutter context
+ discard:
+ build:
+ keep_num: 60
+ artifact:
+ keep_num: 60
+ type: workflow-scm
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines"
+ credentials: "gerrit"
+ branch: 'master'
+ script: test-cookiecutter-model-pipeline.groovy
+ param:
+ CREDENTIALS_ID:
+ type: string
+ description: "ID of jenkins credentials for connecting to gerrit"
+ default: "gerrit"
+ COOKIECUTTER_TEMPLATE_CONTEXT_FILE:
+ type: choice
+ description: "Context for cookiecutter template specified as filename"
+ default: 'stacklight-openstack-ovs-core-pike'
+ OPENSTACK_API_PROJECT:
+ type: string
+ default: "mcp-stacklight"
+ HEAT_STACK_ZONE:
+ type: string
+ default: "mcp-stacklight"
+ FLAVOR_PREFIX:
+ type: string
+ default: 'dev'
+ RUN_SMOKE:
+ type: boolean
+ description: "Run smoke after deployment or not (bool)"
+ default: 'false'
+ COOKIECUTTER_EXTRA_CONTEXT:
+ type: text
+ description: "Extra context items, will be merged to COOKIECUTTER_TEMPLATE_CONTEXT_FILE"
+ default: |-
+ #Extra context that will be merged with content of COOKIECUTTER_TEMPLATE_CONTEXT_FILE
+ default_context:
+ openssh_groups: "qa_scale,oscore_devops,networking,tcpcloud,stacklight,k8s_team"
+ cookiecutter_template_url: https://gerrit.mcp.mirantis.net/mk/cookiecutter-templates.git
+ cookiecutter_template_branch: 'master'
+ shared_reclass_url: https://gerrit.mcp.mirantis.net/salt-models/reclass-system.git
+ shared_reclass_branch: 'master'
+ STACK_INSTALL:
+ type: string
+ default: 'core,openstack,ovs,stacklight'
+ STACK_DELETE:
+ type: boolean
+ description: "Delete Heat stack when finished (bool)"
+ default: 'false'
diff --git a/jenkins/client/job/stacklight/init.yml b/jenkins/client/job/stacklight/init.yml
new file mode 100644
index 0000000..6d8f563
--- /dev/null
+++ b/jenkins/client/job/stacklight/init.yml
@@ -0,0 +1,2 @@
+classes:
+ - system.jenkins.client.job.stacklight.cookiecutter
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 57db539..6187e93 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -276,10 +276,6 @@
type: string
default: "https://github.com/Mirantis/cvp-configuration"
description: URL of repo where testing tools, scenarios, configs are located.
- TEMPEST_VERSION:
- type: string
- default: "15.0.0"
- description: Version of Tempest
cvp-ha:
type: workflow-scm
name: cvp-ha
diff --git a/kubernetes/control/opencontrail.yaml b/kubernetes/control/opencontrail.yaml
new file mode 100644
index 0000000..ba22753
--- /dev/null
+++ b/kubernetes/control/opencontrail.yaml
@@ -0,0 +1,41 @@
+parameters:
+ _param:
+ opencontrail_identity_user: admin
+ opencontrail_identity_password: contrail123
+ opencontrail_identity_tenant: admin
+ kubernetes:
+ pool:
+ network:
+ engine: none
+ opencontrail:
+ enabled: false
+ master:
+ network:
+ engine: none
+ opencontrail:
+ version: {{ cookiecutter.opencontrail_version }}
+ public_ip_range: {{ cookiecutter.opencontrail_public_ip_range }}
+ public_network: {{ cookiecutter.get('opencontrail_public_ip_network', 'default-domain:default-project:Public') }}
+ private_ip_range: {{ cookiecutter.opencontrail_private_ip_range }}
+ config:
+ api:
+ host: ${_param:opencontrail_control_address}
+ identity:
+ auth_user: ${_param:opencontrail_identity_user}
+ auth_password: ${_param:opencontrail_identity_password}
+ auth_tenant: ${_param:kubernetes_opencontrail_identity_tenant}
+ message_queue:
+ host: ${_param:single_address}
+ database:
+ members:
+ - host: ${_param:kubernetes_control_node01_address}
+ port: 9161
+ - host: ${_param:kubernetes_control_node02_address}
+ port: 9161
+ - host: ${_param:kubernetes_control_node03_address}
+ port: 9161
+ collector:
+ members:
+ - host: ${_param:kubernetes_control_node01_address}
+ - host: ${_param:kubernetes_control_node02_address}
+ - host: ${_param:kubernetes_control_node03_address}