commit ca858409a327a4024c7d407672b109bb6d88c9ac
author obutenko <obutenko@ITs-MacBook-Air-2.local> Thu Jul 04 18:31:39 2019 +0300
committer Dennis Dmitriev <dis.xcom@gmail.com> Fri Jul 05 12:26:35 2019 +0000
tree 6952138da90a72c5794664a3ec7f75650883dabf
parent 95c613828b2f139f49b64bb1c9eb8d743239801e

Add jenkins protocol with default value

Change-Id: Iabb4181075b626d74b11c9252147746c3cfd699a

tcp_tests/tests/system/test_cvp_pipelines.py

diff --git a/tcp_tests/tests/system/test_cvp_pipelines.py b/tcp_tests/tests/system/test_cvp_pipelines.py
index a21d2c2..c73bb88 100644
--- a/tcp_tests/tests/system/test_cvp_pipelines.py
+++ b/tcp_tests/tests/system/test_cvp_pipelines.py
@@ -53,7 +53,11 @@
             tgt=tgt, pillar="jenkins:client:master:host")
         jenkins_port = salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:port")
-        jenkins_url = 'http://{0}:{1}'.format(jenkins_host, jenkins_port)
+        jenkins_protocol = salt.get_single_pillar(
+            tgt=tgt, pillar="jenkins:client:master:proto")
+        jenkins_url = '{0}://{1}:{2}'.format(jenkins_protocol,
+                                             jenkins_host,
+                                             jenkins_port)
         jenkins_user = salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:username")
         jenkins_pass = salt.get_single_pillar(
@@ -113,7 +117,11 @@
             tgt=tgt, pillar="jenkins:client:master:host")
         jenkins_port = salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:port")
-        jenkins_url = 'http://{0}:{1}'.format(jenkins_host, jenkins_port)
+        jenkins_protocol = salt.get_single_pillar(
+            tgt=tgt, pillar="jenkins:client:master:proto")
+        jenkins_url = '{0}://{1}:{2}'.format(jenkins_protocol,
+                                             jenkins_host,
+                                             jenkins_port)
         jenkins_user = salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:username")
         jenkins_pass = salt.get_single_pillar(
@@ -209,7 +217,11 @@
             tgt=tgt, pillar="jenkins:client:master:host")
         jenkins_port = salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:port")
-        jenkins_url = 'http://{0}:{1}'.format(jenkins_host, jenkins_port)
+        jenkins_protocol = salt.get_single_pillar(
+            tgt=tgt, pillar="jenkins:client:master:proto")
+        jenkins_url = '{0}://{1}:{2}'.format(jenkins_protocol,
+                                             jenkins_host,
+                                             jenkins_port)
         jenkins_user = salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:username")
         jenkins_pass = salt.get_single_pillar(
@@ -273,7 +285,11 @@
             tgt=tgt, pillar="jenkins:client:master:host")
         jenkins_port = salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:port")
-        jenkins_url = 'http://{0}:{1}'.format(jenkins_host, jenkins_port)
+        jenkins_protocol = salt.get_single_pillar(
+            tgt=tgt, pillar="jenkins:client:master:proto")
+        jenkins_url = '{0}://{1}:{2}'.format(jenkins_protocol,
+                                             jenkins_host,
+                                             jenkins_port)
         jenkins_user = salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:username")
         jenkins_pass = salt.get_single_pillar(