Merge "Use mcp_docker_registry param for k8s upgrade job"
diff --git a/jenkins/client/job/deploy/lab/cicd.yml b/jenkins/client/job/deploy/lab/cicd.yml
index 8252cfd..a713427 100644
--- a/jenkins/client/job/deploy/lab/cicd.yml
+++ b/jenkins/client/job/deploy/lab/cicd.yml
@@ -1,93 +1,2 @@
-parameters:
- jenkins:
- client:
- job_template:
- deploy_heat_cicd:
- name: deploy-heat-{{name}}
- jobs:
- - name: cicd-lab-dev
- lab: cicd_lab_dev
- template:
- type: workflow-scm
- concurrent: true
- discard:
- build:
- keep_num: 10
- display_name: "Deploy {{name}} heat stack"
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: cicd-lab-pipeline.groovy
- param:
- # heat
- HEAT_TEMPLATE_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/mk/heat-templates"
- HEAT_TEMPLATE_CREDENTIALS:
- type: string
- default: "gerrit"
- HEAT_TEMPLATE_BRANCH:
- type: string
- default: "master"
- HEAT_STACK_NAME:
- type: string
- description: Heat stack name. Will be generated if missing.
- HEAT_STACK_TEMPLATE:
- type: string
- default: "{{lab}}"
- HEAT_STACK_ENVIRONMENT:
- type: string
- default: "devcloud"
- HEAT_STACK_ZONE:
- type: string
- default: "mcp-mk"
- HEAT_STACK_PUBLIC_NET:
- type: string
- default: "public"
- 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:
- type: string
- default: "salt-qa-credentials"
- SSH_PUBLIC_KEY:
- type: string
- description: "User's public SSH key to be able to login when stack is deployed"
-
- # 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"
+# 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/deploy/lab/cleanup.yml b/jenkins/client/job/deploy/lab/cleanup.yml
index 6ecaeee..a713427 100644
--- a/jenkins/client/job/deploy/lab/cleanup.yml
+++ b/jenkins/client/job/deploy/lab/cleanup.yml
@@ -1,108 +1,2 @@
-parameters:
- jenkins:
- client:
- job:
- deploy-stack-cleanup:
- type: workflow-scm
- concurrent: true
- display_name: "Deploy - stack cleanup"
- discard:
- build:
- keep_num: 50
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: cleanup-pipeline.groovy
- param:
- # 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://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_PROJECT_ID:
- type: string
- default: ""
- OPENSTACK_API_USER_DOMAIN:
- type: string
- default: "default"
-
- # aws parameters
- AWS_API_CREDENTIALS:
- type: string
- default: "aws-credentials"
- AWS_DEFAULT_REGION:
- type: string
- default: "eu-central-1"
-
- delete-failed-stacks:
- type: workflow-scm
- concurrent: true
- display_name: "Deploy - delete failed stacks"
- discard:
- build:
- keep_num: 20
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: delete-broken-stacks-pipeline.groovy
- trigger:
- timer:
- spec: "0 0 * * *"
- param:
- # 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-k8s, mcp-maintenance, mcp-mk, mcp-networking, mcp-opencontrail, mcp-oss, mcp-platform, mcp-scale, mcp-stacklight, mcp-support"
- 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"
+# 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/deploy/lab/init.yml b/jenkins/client/job/deploy/lab/init.yml
index 2b0bd60..fae3ff0 100644
--- a/jenkins/client/job/deploy/lab/init.yml
+++ b/jenkins/client/job/deploy/lab/init.yml
@@ -1,6 +1,4 @@
classes:
- - system.jenkins.client.job.deploy.lab.cicd
- - system.jenkins.client.job.deploy.lab.cleanup
- system.jenkins.client.job.deploy.lab.release.mcp05
- system.jenkins.client.job.deploy.lab.release.mcp10
- system.jenkins.client.job.deploy.lab.release.mcp11
@@ -10,7 +8,6 @@
- system.jenkins.client.job.deploy.lab.component.kubernetes
- system.jenkins.client.job.deploy.lab.component.openstack
- system.jenkins.client.job.deploy.lab.component.stacklight
- - system.jenkins.client.job.deploy.lab.ironic
- system.jenkins.client.job.deploy.lab.mom_deploy
parameters:
diff --git a/jenkins/client/job/deploy/lab/ironic.yml b/jenkins/client/job/deploy/lab/ironic.yml
index f0b67e8..a713427 100644
--- a/jenkins/client/job/deploy/lab/ironic.yml
+++ b/jenkins/client/job/deploy/lab/ironic.yml
@@ -1,80 +1,2 @@
-parameters:
- jenkins:
- client:
- job:
- ironic_node_provision:
- concurrent: true
- discard:
- build:
- keep_num: 20
- display_name: Ironic - provision nodes
- name: ironic-provision-nodes
- param:
- ASK_ON_ERROR:
- default: 'false'
- type: boolean
- HEAT_STACK_ZONE:
- default: mcp-mk
- type: string
- OPENSTACK_API_CLIENT:
- default: ''
- type: string
- OPENSTACK_API_CREDENTIALS:
- default: openstack-devcloud-credentials
- type: string
- OPENSTACK_API_PROJECT:
- default: mcp-mk
- type: string
- OPENSTACK_API_PROJECT_DOMAIN:
- default: default
- type: string
- OPENSTACK_API_PROJECT_ID:
- default: ''
- type: string
- OPENSTACK_API_URL:
- default: https://cloud-cz.bud.mirantis.net:5000
- type: string
- OPENSTACK_API_USER_DOMAIN:
- default: default
- type: string
- OPENSTACK_API_USER_DOMAIN_ID:
- default: default
- type: string
- OPENSTACK_API_VERSION:
- default: '3'
- type: string
- ENV_NAME:
- type: string
- SALT_MASTER_CREDENTIALS:
- default: salt-qa-credentials
- type: string
- SALT_MASTER_URL:
- default: ''
- type: string
- STACK_TYPE:
- default: heat
- type: string
- IRONIC_AUTHORIZATION_PROFILE:
- default: admin_identity
- type: string
- IRONIC_DEPLOY_NODES:
- default: ''
- type: string
- IRONIC_DEPLOY_PROFILE:
- default: ''
- type: string
- IRONIC_DEPLOY_TIMEOUT:
- default: '60'
- type: string
- IRONIC_DEPLOY_PARTITION_PROFILE:
- default: ''
- type: string
- RUN_TARGET:
- default: 'I@ironic:client and *01*'
- type: string
- scm:
- script: ironic-node-provision-pipeline.groovy
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- type: workflow-scm
+# 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 6bb36a7..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
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