Merge "Update minimal size"
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 0bce371..97c1fe8 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -90,6 +90,9 @@
ironic_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
ironic_memcache_secret_key: ''
ironic_console_enabled: true
+ ironic_old_version: ${_param:openstack_old_version}
+ ironic_version: ${_param:openstack_version}
+ ironic_upgrade_enabled: ${_param:openstack_upgrade_enabled}
# Keystone
keystone_old_version: ${_param:openstack_old_version}
keystone_version: ${_param:openstack_version}
diff --git a/ironic/api/cluster.yml b/ironic/api/cluster.yml
index 7119872..d343e28 100644
--- a/ironic/api/cluster.yml
+++ b/ironic/api/cluster.yml
@@ -2,6 +2,7 @@
- system.salt.minion.cert.mysql.clients.openstack.ironic
- system.salt.minion.cert.rabbitmq.clients.openstack.ironic
- service.ironic.api.cluster
+- system.ironic.upgrade
parameters:
linux:
system:
diff --git a/ironic/api/single.yml b/ironic/api/single.yml
index 47b64de..0e5d61e 100644
--- a/ironic/api/single.yml
+++ b/ironic/api/single.yml
@@ -2,6 +2,7 @@
- system.salt.minion.cert.mysql.clients.openstack.ironic
- system.salt.minion.cert.rabbitmq.clients.openstack.ironic
- service.ironic.api.single
+- system.ironic.upgrade
parameters:
linux:
system:
diff --git a/ironic/conductor/cluster.yml b/ironic/conductor/cluster.yml
index 917b8d0..b733a87 100644
--- a/ironic/conductor/cluster.yml
+++ b/ironic/conductor/cluster.yml
@@ -2,6 +2,7 @@
- system.salt.minion.cert.mysql.clients.openstack.ironic
- system.salt.minion.cert.rabbitmq.clients.openstack.ironic
- service.ironic.conductor.cluster
+- system.ironic.upgrade
parameters:
_param:
ironic_conductor_api_url_protocol: 'http'
diff --git a/ironic/conductor/single.yml b/ironic/conductor/single.yml
index 9cd2e06..752f1cf 100644
--- a/ironic/conductor/single.yml
+++ b/ironic/conductor/single.yml
@@ -2,6 +2,7 @@
- system.salt.minion.cert.mysql.clients.openstack.ironic
- system.salt.minion.cert.rabbitmq.clients.openstack.ironic
- service.ironic.conductor.single
+- system.ironic.upgrade
parameters:
linux:
system:
diff --git a/ironic/upgrade/init.yml b/ironic/upgrade/init.yml
new file mode 100644
index 0000000..ebd9bfd
--- /dev/null
+++ b/ironic/upgrade/init.yml
@@ -0,0 +1,6 @@
+parameters:
+ ironic:
+ upgrade:
+ enabled: ${_param:ironic_upgrade_enabled}
+ old_release: ${_param:ironic_old_version}
+ new_release: ${_param:ironic_version}
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 1ee9fbc..0f0bbf8 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -465,3 +465,76 @@
type: text
default: "---"
description: YAML context with additional parameters
+ cvp-shaker:
+ type: workflow-scm
+ name: cvp-shaker
+ display_name: "CVP - Shaker network tests"
+ discard:
+ build:
+ keep_num: 20
+ artifact:
+ keep_num: 20
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
+ credentials: "gerrit"
+ script: cvp-shaker.groovy
+ param:
+ IMAGE:
+ type: string
+ default: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-shaker:${_param:mcp_version}"
+ description: Docker image to use for running Shaker.
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
+ description: Full Salt API address [e.g. https://10.10.10.2:6969].
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ description: Credentials to the Salt API.
+ SHAKER_PARAMS:
+ type: text
+ default: |
+ ---
+ SHAKER_SERVER_ENDPOINT: '10.13.0.15:5999'
+ SHAKER_SCENARIOS: 'scenarios/essential'
+ SKIP_LIST: ''
+ image_builder:
+ # - SHAKER_FLAVOR_DISK=4
+ # - SHAKER_FLAVOR_RAM=512
+ # - SHAKER_FLAVOR_VCPUS=1
+ # - SHAKER_IMAGE_BUILDER_MODE='dib'
+ shaker:
+ # - SHAKER_AGENT_JOIN_TIMEOUT=300
+ # - SHAKER_AGENT_LOSS_TIMEOUT=120
+ # - SCENARIO_AVAILABILITY_ZONE='nova,internal'
+ # - SCENARIO_COMPUTE_NODES=2
+ # - SHAKER_EXTERNAL_NET='public'
+ description: |
+ YAML context with parameters for running Shaker tests, where
+ "SHAKER_SERVER_ENDPOINT" - Address for Shaker server connections (host:port). Should be accessible
+ from tenant's VM network (usually equals to public address of cicd node)
+ "SHAKER_SCENARIOS" - Path to shaker scenarios in the cvp-shaker docker image
+ (can be directory or specific file). Main categories are
+ scenarios/essential/l2
+ scenarios/essential/l3
+ scenarios/additional/cross_az
+ scenarios/additional/external
+ scenarios/additional/qos
+ "SKIP_LIST" - Comma-separated list of Shaker scenarios to skip, directories or files inside scenarios/
+ of cvp-shaker, e.g. "dense_l2.yaml,full_l2.yaml,l3"
+ "image_builder" - shaker-image-builder env variables
+ SHAKER_FLAVOR_DISK=4
+ SHAKER_FLAVOR_RAM=512
+ SHAKER_FLAVOR_VCPUS=1
+ SHAKER_IMAGE_BUILDER_MODE='dib'
+ "shaker" - main shaker runner env variables
+ SHAKER_AGENT_JOIN_TIMEOUT=300
+ SHAKER_AGENT_LOSS_TIMEOUT=120
+ SCENARIO_AVAILABILITY_ZONE='nova,internal'
+ SCENARIO_COMPUTE_NODES=2
+ SHAKER_EXTERNAL_NET='public'
+ For the more detailed description of the last two categories please refer to the shaker documentation
+ https://pyshaker.readthedocs.io/en/latest/tools.html