Merge " Add VM for OpenDaylight"
diff --git a/jobs/global.yaml b/jobs/global.yaml
index 62adb50..47576b0 100644
--- a/jobs/global.yaml
+++ b/jobs/global.yaml
@@ -4,6 +4,12 @@
Do not edit this job through the web ! <br>
Please use jenkins-job-builder in git <br>
git clone ssh://gerrit.mcp.mirantis.com:29418/mcp/tcp-qa
+
+ <h1><font color='red'>
+ <!--- INSERT ALERT HERE vvvvvvv --->
+
+ <!--- INSERT ALERT HERE ^^^^^^^ --->
+ </font></h1>
current-version: 2019.2.16
previous-version: 2019.2.15
disabled-proposed: false
diff --git a/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy b/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy
index e652b72..8159b51 100644
--- a/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy
+++ b/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy
@@ -284,7 +284,7 @@
[ -d /home/jenkins/venv_testrail_analyzer ] || virtualenv --python=python3 /home/jenkins/venv_testrail_analyzer
""", true, false, true)
shared.run_cmd("""\
- . /home/jenkins/venv_testrail_analyzer/bin/activate; pip install git+https://review.gerrithub.io/ibumarskov/testrail-reporter@refs/changes/94/514594/3
+ . /home/jenkins/venv_testrail_analyzer/bin/activate; pip install git+https://review.gerrithub.io/ibumarskov/testrail-reporter@refs/changes/53/524553/1
""")
shared.update_working_dir()
}
diff --git a/jobs/templates/bm-e7-cicd-pike-odl-maas.yml b/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
index 1b21f1c..80a464e 100644
--- a/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
+++ b/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
@@ -43,6 +43,11 @@
name: MCP_VERSION
trim: 'false'
- string:
+ default: ''
+ description: ''
+ name: SALT_MODELS_SYSTEM_REF_CHANGE
+ trim: 'false'
+ - string:
default: sre-team-infra
description: ''
name: NODE_NAME
diff --git a/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml b/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
index b0feb54..d8de8b1 100644
--- a/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
+++ b/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
@@ -70,6 +70,11 @@
name: TCP_QA_REFS
trim: 'false'
- string:
+ default: ''
+ description: ''
+ name: SALT_MODELS_SYSTEM_REF_CHANGE
+ trim: 'false'
+ - string:
default: refs/heads/release/2019.2.0
description: reference to patchset in pipeline-library
name: PIPELINE_LIBRARY_REF
diff --git a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
index 4ddd929..5e3d05c 100644
--- a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
@@ -136,7 +136,7 @@
name: TEMPEST_TARGET
trim: 'false'
- string:
- default: proposed
+ default: ''
description: ''
name: UPDATE_REPO_CUSTOM_TAG
trim: 'false'
diff --git a/src/com/mirantis/system_qa/SharedPipeline.groovy b/src/com/mirantis/system_qa/SharedPipeline.groovy
index e83a94b..dae2ce4 100644
--- a/src/com/mirantis/system_qa/SharedPipeline.groovy
+++ b/src/com/mirantis/system_qa/SharedPipeline.groovy
@@ -289,6 +289,7 @@
string(name: 'TCP_QA_REFS', value: "${tcp_qa_refs}"),
string(name: 'PIPELINE_LIBRARY_REF', value: "${pipeline_library_ref}"),
string(name: 'MK_PIPELINES_REF', value: "${mk_pipelines_ref}"),
+ string(name: 'SALT_MODELS_SYSTEM_REF_CHANGE', value: env.SALT_MODELS_SYSTEM_REF_CHANGE ?: ''),
string(name: 'COOKIECUTTER_TEMPLATE_COMMIT', value: "${cookiecutter_template_commit}"),
string(name: 'SALT_MODELS_SYSTEM_COMMIT', value: "${salt_models_system_commit}"),
string(name: 'COOKIECUTTER_REF_CHANGE', value: "${cookiecutter_ref_change}"),
@@ -445,6 +446,7 @@
string(name: 'DOMAIN_NAME', value: "${LAB_CONFIG_NAME}.local"),
string(name: 'REPOSITORY_SUITE', value: "${env.MCP_VERSION}"),
string(name: 'SALT_MODELS_SYSTEM_COMMIT', value: "${saltmodels_system_commit}"),
+ string(name: 'SALT_MODELS_SYSTEM_REF_CHANGE', value: env.SALT_MODELS_SYSTEM_REF_CHANGE ?: ''),
string(name: 'COOKIECUTTER_TEMPLATE_COMMIT', value: "${cookiecuttertemplate_commit}"),
string(name: 'COOKIECUTTER_REF_CHANGE', value: "${cookiecutter_ref_change}"),
string(name: 'ENVIRONMENT_TEMPLATE_REF_CHANGE', value: "${environment_template_ref_change}"),
@@ -498,6 +500,7 @@
string(name: 'DEPLOY_NETWORK_NETMASK', value: "${deploy_network_mask}"),
string(name: 'PIPELINE_LIBRARY_REF', value: "${pipeline_library_ref}"),
string(name: 'MK_PIPELINES_REF', value: "${mk_pipelines_ref}"),
+ string(name: 'SALT_MODELS_SYSTEM_REF_CHANGE', value: env.SALT_MODELS_SYSTEM_REF_CHANGE ?: ''),
string(name: 'TCP_QA_REFS', value: "${tcp_qa_refs}"),
string(name: 'UPDATE_VERSION', value: "${update_version}"),
string(name: 'MCP_COMMON_SCRIPTS_REFS', value: "${mcp_common_scripts_ref}"),
diff --git a/tcp_tests/templates/_packer/scripts/jenkins_virtualenvs.sh b/tcp_tests/templates/_packer/scripts/jenkins_virtualenvs.sh
index 1e0d43e..1a50506 100644
--- a/tcp_tests/templates/_packer/scripts/jenkins_virtualenvs.sh
+++ b/tcp_tests/templates/_packer/scripts/jenkins_virtualenvs.sh
@@ -35,7 +35,7 @@
. ${TESTMARKER_VENV_PATH}/bin/activate
#pip install git+https://github.com/ibumarskov/testrail-reporter -U
# Pull from review to test changes in testrail-reporter before their merging
-pip install git+https://review.gerrithub.io/ibumarskov/testrail-reporter@refs/changes/94/514594/3
+pip install git+https://review.gerrithub.io/ibumarskov/testrail-reporter@refs/changes/53/524553/1
deactivate
if [ "$CHANGE_RIGHTS" = true ]; then
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot b/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
index c7f6ea6..6971e77 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
@@ -130,7 +130,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
cfg01_flavor: { get_param: cfg_flavor }
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -678,7 +678,7 @@
instance_name: foundation
instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
diff --git a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay.hot b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay.hot
index 0c92b47..928d76f 100644
--- a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay.hot
@@ -127,7 +127,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
cfg01_flavor: { get_param: cfg_flavor }
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -932,7 +932,7 @@
instance_name: foundation
instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
index 1d24327..6319401 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
@@ -130,7 +130,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
cfg01_flavor: { get_param: cfg_flavor }
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -678,7 +678,7 @@
instance_name: foundation
instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
diff --git a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/underlay.hot b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/underlay.hot
index 8fc50af..726ee09 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/underlay.hot
+++ b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/underlay.hot
@@ -127,7 +127,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
cfg01_flavor: { get_param: cfg_flavor }
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -932,7 +932,7 @@
instance_name: foundation
instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay.hot b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay.hot
index 95fc69e..07f30aa 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay.hot
@@ -130,7 +130,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
cfg01_flavor: { get_param: cfg_flavor }
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -678,7 +678,7 @@
instance_name: foundation
instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
diff --git a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/underlay.hot b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/underlay.hot
index d9da3dd..4c12277 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/underlay.hot
+++ b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/underlay.hot
@@ -127,7 +127,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
cfg01_flavor: { get_param: cfg_flavor }
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -932,7 +932,7 @@
instance_name: foundation
instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay.hot b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay.hot
index 88997d7..a82aaf0 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay.hot
@@ -130,7 +130,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
cfg01_flavor: { get_param: cfg_flavor }
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -678,7 +678,7 @@
instance_name: foundation
instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 5621b02..200ae8d 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -454,6 +454,10 @@
chmod 0600 /tmp/{{ COOKIECUTTER_TEMPLATES_REPOSITORY_KEY_PATH | basename }}
eval $(ssh-agent)
ssh-add /tmp/{{ COOKIECUTTER_TEMPLATES_REPOSITORY_KEY_PATH | basename }}
+
+ git config --global user.name {{ HOSTNAME_CFG01 }}
+ git config --global user.email {{ HOSTNAME_CFG01 }}@example.com
+
export GIT_SSL_NO_VERIFY=true; git clone {{ COOKIECUTTER_TEMPLATES_REPOSITORY }} /root/cookiecutter-templates
{%- if COOKIECUTTER_REF_CHANGE != '' %}
@@ -544,13 +548,8 @@
cmd: |
set -e;
set -x;
- {%- if SALT_MODELS_SYSTEM_REF_CHANGE != '' %}
- pushd /srv/salt/reclass/classes/system/ && \
- {%- for item in SALT_MODELS_SYSTEM_REF_CHANGE.split(" ") %}
- git fetch {{ SALT_MODELS_SYSTEM_REPOSITORY }} {{ item }} && git cherry-pick FETCH_HEAD;
- {%- endfor %}
- popd;
- {%- elif SALT_MODELS_SYSTEM_COMMIT != '' %}
+
+ {%- if SALT_MODELS_SYSTEM_COMMIT != '' %}
pushd /srv/salt/reclass/classes/system/
git checkout {{ SALT_MODELS_SYSTEM_COMMIT }};
popd;
@@ -561,6 +560,14 @@
popd;
{%- endif %}
+ {%- if SALT_MODELS_SYSTEM_REF_CHANGE != '' %}
+ pushd /srv/salt/reclass/classes/system/ && \
+ {%- for item in SALT_MODELS_SYSTEM_REF_CHANGE.split(" ") %}
+ git fetch {{ SALT_MODELS_SYSTEM_REPOSITORY }} {{ item }} && git cherry-pick FETCH_HEAD;
+ {%- endfor %}
+ popd;
+ {%- endif %}
+
{%- if IS_CONTRAIL_LAB %}
export REPLACE_DIRS="/srv/salt/reclass/classes/ /srv/salt/reclass/nodes/"
# vSRX IPs for tcp-qa images have 172.16.10.90 hardcoded
diff --git a/tcp_tests/tests/system/test_mcp_update.py b/tcp_tests/tests/system/test_mcp_update.py
index 45e3cdd..69253c9 100644
--- a/tcp_tests/tests/system/test_mcp_update.py
+++ b/tcp_tests/tests/system/test_mcp_update.py
@@ -499,7 +499,7 @@
job_result, job_description = dt.start_job_on_jenkins(
job_name='deploy-upgrade-rabbitmq',
job_parameters=job_parameters,
- build_timeout=40 * 60
+ build_timeout=50 * 60
)
assert job_result == 'SUCCESS', job_description