Merge "Restore withCredential step for cookiecutter job"
diff --git a/jobs/pipelines/generate-report.sh b/jobs/pipelines/generate-report.sh
index 68fefbb..58c7854 100644
--- a/jobs/pipelines/generate-report.sh
+++ b/jobs/pipelines/generate-report.sh
@@ -2,8 +2,7 @@
. ${CUSTOM_REPO_VENV_PATH}/bin/activate
-set -x
-set -e
+set -eo pipefail;
if [ -z "${DATE}" ]; then
d=$(date +%Y-%m-%d)
@@ -29,7 +28,9 @@
echo ${PLAN_NAME}
fi
+[ -d ${VENV_PATH} ] || virtualenv ${VENV_PATH}
. ${VENV_PATH}/bin/activate
+pip install testrail==0.3.14 jira==2.0.0 functools32==3.2.3.post2
python tcp_tests/report.py create-report \
--testrail-host "$TESTRAIL_URL" \
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt.yaml b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt.yaml
index b75aa5e..278b502 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt.yaml
@@ -94,3 +94,11 @@
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
+
+- description: Create cinder-volumes-pool on cmp for e7. RelatedProd:PROD-36975
+ cmd: |
+ set -x;
+ salt -C 'cmp*' cmd.run 'vgcreate cinder-vg /dev/sdb';
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: { count: 1, delay: 1 }
+ skip_fail: false
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/underlay--user-data-foundation.yaml b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/underlay--user-data-foundation.yaml
index e52d56d..5f00b1a 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/underlay--user-data-foundation.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/underlay--user-data-foundation.yaml
@@ -67,6 +67,7 @@
address $management_static_ip
netmask 255.255.255.192
gateway $management_gw
+ up route add -net 10.167.11.0 netmask 255.255.255.0 gw 172.16.162.67
dns-nameservers $dnsaddress
- path: /etc/bash_completion.d/fuel_devops30_activate
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt.yaml
index 2b15d2a..f1b726f 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt.yaml
@@ -97,7 +97,7 @@
- description: Create cinder-volumes-pool on cmp for e7. RelatedProd:PROD-36975
cmd: |
set -x;
- salt -C 'I@cinder:volume and cmp*' cmd.run 'vgcreate cinder-vg /dev/sdb';
+ salt -C 'cmp*' cmd.run 'vgcreate cinder-vg /dev/sdb';
node_name: {{ HOSTNAME_CFG01 }}
retry: { count: 1, delay: 1 }
skip_fail: false
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay--user-data-foundation.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay--user-data-foundation.yaml
index e52d56d..5f00b1a 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay--user-data-foundation.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay--user-data-foundation.yaml
@@ -67,6 +67,7 @@
address $management_static_ip
netmask 255.255.255.192
gateway $management_gw
+ up route add -net 10.167.11.0 netmask 255.255.255.0 gw 172.16.162.67
dns-nameservers $dnsaddress
- path: /etc/bash_completion.d/fuel_devops30_activate