Merge "Remove jenkins/job/deploy/lab/{ironic,cleanup,cicd} jobs It was moved into infra model"diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 7e419f6..a713427 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -1,222 +1,2 @@
-parameters:
- _param:
- jenkins_deploy_jobs: []
- heat_stack_zone_job_param:
- type: string
- default: "mcp-mk"
- openstack_api_projects_job_param:
- type: string
- default: "mcp-mk"
- jenkins:
- client:
- job_template:
- deploy_template:
- name: deploy-{{stack_type}}-{{stack_name}}
- jobs: ${_param:jenkins_deploy_jobs}
- template:
- type: workflow-scm
- discard:
- build:
- keep_num: 100
- concurrent: true
- display_name: "Deploy - {{stack_name}} {{stack_type}}"
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: cloud-deploy-pipeline.groovy
- trigger:
- timer:
- spec: "{{job_timer}}"
- param:
- # general parameters
- ASK_ON_ERROR:
- type: boolean
- default: 'false'
- SLAVE_NODE:
- type: string
- default: 'python'
-
- # deployments
- STACK_NAME:
- type: string
- description: Heat stack name. Will be generated if missing.
- STACK_TYPE:
- type: string
- default: "{{stack_type}}"
- STACK_INSTALL:
- type: string
- default: "{{stack_install}}"
- 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_COMPUTE_COUNT:
- type: string
- default: '2'
- STACK_CLUSTER_NAME:
- type: string
- default: ""
- description: "Cluster name to use from reclass"
-
- STACK_TEMPLATE:
- type: string
- default: "{{stack_name}}"
- STACK_TEMPLATE_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/mk/heat-templates"
- STACK_TEMPLATE_CREDENTIALS:
- type: string
- default: "gerrit"
- STACK_TEMPLATE_BRANCH:
- type: string
- default: "master"
- STACK_CLEANUP_JOB:
- type: string
- default: 'deploy-stack-cleanup'
-
- STACK_RECLASS_ADDRESS:
- type: string
- default: ""
- STACK_RECLASS_BRANCH:
- type: string
- default: ""
-
- # salt
- EXTRA_TARGET:
- type: string
- default: ""
- description: "Salt extra target for edge clouds deployment"
- SALT_MASTER_CREDENTIALS:
- type: string
- default: "salt-qa-credentials"
- SALT_MASTER_URL:
- type: string
- default: ""
- SALT_OVERRIDES:
- type: text
- default: ""
- description: "YAML with overrides for Salt deployment"
- SALT_VERSION:
- type: text
- default: "stable 2017.7"
- description: "Version of Salt which is going to be installed i.e. 'stable 2016.3' or 'stable 2017.7' etc. Warning: This value doesn't override salt_version parameter set in the pillar."
- BOOTSTRAP_EXTRA_REPO_PARAMS:
- type: string
- default: ""
- description: "Defines a list of extra repos with parameters, format: repo 1, repo priority 1, repo pin 1; repo 2, repo priority 2, repo pin 2"
- FORMULA_PKG_REVISION:
- type: string
- default: ""
- description: "Formulas revision to install on Salt Master bootstrap stage"
- STATIC_MGMT_NETWORK:
- type: boolean
- default: 'false'
- description: "Check if model contains static IP address definitions for all nodes"
-
- # aws api
- AWS_STACK_REGION:
- type: string
- default: "eu-central-1"
- AWS_API_CREDENTIALS:
- type: string
- default: "aws-credentials"
- AWS_SSH_KEY:
- type: string
- default: "jenkins-mk"
-
- # heat
- HEAT_STACK_ENVIRONMENT:
- type: string
- default: "{{stack_env}}"
- HEAT_STACK_ZONE: ${_param:heat_stack_zone_job_param}
- HEAT_STACK_PUBLIC_NET:
- type: string
- default: "public"
-
- # 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: ${_param:openstack_api_projects_job_param}
- OPENSTACK_API_PROJECT_DOMAIN:
- type: string
- default: "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"
- TEST_K8S_CONFORMANCE_IMAGE:
- type: string
- default: "docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.11.3-2"
-
- 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"
- default: ""
-
- # TestRail vars
- TESTRAIL_REPORT:
- type: boolean
- description: "Report test results to TestRail if true"
- default: "false"
- TESTRAIL_REPORTER_IMAGE:
- type: string
- description: "Testrail reporter docker image"
- default: "alrem/xunit2testrail"
- TESTRAIL_QA_CREDENTIALS:
- type: string
- description: "Credentials for results upload to testrail"
- default: "oscore-qa-credentials"
- TESTRAIL_MILESTONE:
- type: string
- description: "TestRail milestone"
- default: "MCP1.1"
- TESTRAIL_PLAN:
- type: string
- description: "TestRail test plan name. Will be generated if missing."
- default: ""
- TESTRAIL_GROUP:
- type: string
- description: "TestRail test group name."
- default: "{{stack_name}}"
- TESTRAIL_SUITE:
- type: string
- description: "TestRail test suite name"
- default: "Tempest 16.0.0 with designate tests"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/oscore/cookiecutter.yml b/jenkins/client/job/oscore/cookiecutter.yml
index 53d8260..23b9371 100644
--- a/jenkins/client/job/oscore/cookiecutter.yml
+++ b/jenkins/client/job/oscore/cookiecutter.yml
@@ -34,6 +34,7 @@
- openstack-ovs-core-barbican-pike
- openstack-ovs-core-manila-pike
- openstack-ovs-core-telemetry-pike
+ - openstack-ovs-core-extra-ssl-pike
- openstack-ovs-core-queens
- openstack-ovs-core-extra-queens
- openstack-ovs-core-ssl-queens
@@ -76,9 +77,9 @@
#Extra context that will be merged with content of COOKIECUTTER_TEMPLATE_CONTEXT_FILE
default_context:
openssh_groups: "qa_scale,oscore_devops,networking,tcpcloud,drivetrain,stacklight,k8s_team,mcp_qa"
- cookiecutter_template_url: https://gerrit.mcp.mirantis.net/mk/cookiecutter-templates.git
+ cookiecutter_template_url: ssh://mcp-ci-gerrit@gerrit.mcp.mirantis.com:29418/mk/cookiecutter-templates.git
cookiecutter_template_branch: 'master'
- shared_reclass_url: https://gerrit.mcp.mirantis.net/salt-models/reclass-system.git
+ shared_reclass_url: ssh://mcp-ci-gerrit@gerrit.mcp.mirantis.com:29418/salt-models/reclass-system.git
shared_reclass_branch: 'master'
STACK_INSTALL:
type: string
diff --git a/jenkins/client/job/oscore/test_upgrades.yml b/jenkins/client/job/oscore/test_upgrades.yml
index e193d58..2288baa 100644
--- a/jenkins/client/job/oscore/test_upgrades.yml
+++ b/jenkins/client/job/oscore/test_upgrades.yml
@@ -54,6 +54,55 @@
type: string
description: "Yaml based scheme to be applied in testing"
default: '{"old": {"run_smoke": True, "context_file_name": "openstack-ovs-core-{{openstack_version_old}}","extra_context": {"default_context": {"openstack_version": "{{openstack_version_old}}"}}}, "new": {"run_smoke": True, "extra_context": {"default_context": {"openstack_version": "{{openstack_version_new}}"}}}}'
+ oscore-test-openstack-upgrade-template:
+ display_name: oscore-test-openstack-upgrade-{{openstack_version_old}}-{{openstack_version_new}}-{{deploy_context}}
+ name: oscore-test-openstack-upgrade-{{openstack_version_old}}-{{openstack_version_new}}-{{deploy_context}}
+ concurrent: true
+ description: Test upgrade flow for opentack cluster
+ 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-openstack-upgrade-pipeline.groovy
+ param:
+ CREDENTIALS_ID:
+ type: string
+ description: "ID of jenkins credentials to be used when connecting to gerrit."
+ default: "gerrit"
+ OPENSTACK_ENVIRONMENT:
+ type: choice
+ description: "Target openstack environment."
+ choices:
+ - devcloud
+ - presales
+ - oscore_devcloud
+ OPENSTACK_API_CREDENTIALS:
+ type: string
+ description: "Credentials to the OpenStack API"
+ OPENSTACK_API_PROJECT:
+ type: string
+ default: "mcp-oscore-ci"
+ HEAT_STACK_ZONE:
+ type: string
+ default: "mcp-oscore-ci"
+ FLAVOR_PREFIX:
+ type: string
+ default: 'dev'
+ STACK_DELETE:
+ type: boolean
+ default: 'true'
+ description: Don't enable it if you need to use the lab after
+ TEST_SCHEME:
+ type: string
+ description: "Yaml based scheme to be applied in testing"
+ default: '{"old": {"run_smoke": True, "context_file_name": "openstack-ovs-{{deploy_context}}-{{openstack_version_old}}","extra_context": {"default_context": {"openstack_version": "{{openstack_version_old}}"}}}, "new": {"run_smoke": True, "extra_context": {"default_context": {"openstack_version": "{{openstack_version_new}}"}}}}'
job:
oscore-test-openstack-upgrade-mitaka-newton:
display_name: oscore-test-openstack-upgrade-mitaka-newton
diff --git a/jenkins/client/job/stacklight/cookiecutter.yml b/jenkins/client/job/stacklight/cookiecutter.yml
index 15f0bb6..9ba858c 100644
--- a/jenkins/client/job/stacklight/cookiecutter.yml
+++ b/jenkins/client/job/stacklight/cookiecutter.yml
@@ -61,9 +61,9 @@
#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,drivetrain"
- cookiecutter_template_url: https://gerrit.mcp.mirantis.net/mk/cookiecutter-templates.git
+ cookiecutter_template_url: ssh://mcp-ci-gerrit@gerrit.mcp.mirantis.com:29418/mk/cookiecutter-templates.git
cookiecutter_template_branch: 'master'
- shared_reclass_url: https://gerrit.mcp.mirantis.net/salt-models/reclass-system.git
+ shared_reclass_url: ssh://mcp-ci-gerrit@gerrit.mcp.mirantis.com:29418/salt-models/reclass-system.git
shared_reclass_branch: 'master'
STACK_INSTALL:
type: string