aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2021-03-05 08:43:45 +0100
committerTibor Frank <tifrank@cisco.com>2021-03-05 08:43:45 +0100
commit769f6c8877eb5f4af46a782599acc3d16cf7f35b (patch)
tree8338836deff04de4cc863965daa3b4290661a891
parent674a67c6dfdc4edd8505fe1793bcd6dbecae5580 (diff)
PAL: download - ignore verifying the SSL certificate
- only for https://logs.nginx.service.consul/vex-yul-rot-jenkins-1 Change-Id: Ibdcc59a44d5aae331aeef22fad54c4e90b2eec6b Signed-off-by: Tibor Frank <tifrank@cisco.com>
-rw-r--r--resources/tools/presentation/input_data_files.py6
-rwxr-xr-xresources/tools/presentation/run_cpta.sh3
-rwxr-xr-xresources/tools/presentation/run_report.sh3
-rw-r--r--resources/tools/presentation/specification.yaml2
-rw-r--r--resources/tools/presentation/specification_CPTA.yaml2
-rw-r--r--resources/tools/presentation/specification_local.yaml2
6 files changed, 12 insertions, 6 deletions
diff --git a/resources/tools/presentation/input_data_files.py b/resources/tools/presentation/input_data_files.py
index 47249b1323..237002f08b 100644
--- a/resources/tools/presentation/input_data_files.py
+++ b/resources/tools/presentation/input_data_files.py
@@ -90,7 +90,7 @@ def _download_file(url, file_name, arch=False):
try:
logging.info(f" Connecting to {url} ...")
session = requests_retry_session()
- response = session.get(url, stream=True)
+ response = session.get(url, stream=True, verify=False)
code = response.status_code
logging.info(f" {code}: {responses[code]}")
@@ -100,7 +100,7 @@ def _download_file(url, file_name, arch=False):
url = url.replace(u"_info", u"")
logging.info(f" Connecting to {url} ...")
session = requests_retry_session()
- response = session.get(url, stream=True)
+ response = session.get(url, stream=True, verify=False)
code = response.status_code
logging.info(f" {code}: {responses[code]}")
if code != codes[u"OK"]:
@@ -119,7 +119,7 @@ def _download_file(url, file_name, arch=False):
session.close()
logging.info(f" Downloading the file {url} to {file_name} ...")
session = requests_retry_session()
- response = session.get(url, stream=True)
+ response = session.get(url, stream=True, verify=False)
if response.status_code == codes[u"OK"]:
with open(file_name, u"wb") as file_handle:
file_handle.write(response.raw.read())
diff --git a/resources/tools/presentation/run_cpta.sh b/resources/tools/presentation/run_cpta.sh
index 1aa5703162..94745f7a6f 100755
--- a/resources/tools/presentation/run_cpta.sh
+++ b/resources/tools/presentation/run_cpta.sh
@@ -19,6 +19,9 @@ mkdir ${DIR[WORKING]}
virtualenv -p $(which python3) ${DIR[WORKING]}/env
source ${DIR[WORKING]}/env/bin/activate
+# FIXME: Temporary hack until all docker dns will be solved
+echo "nameserver 172.17.0.1" > /etc/resolv.conf
+
# Install python dependencies:
pip3 install -r requirements.txt
diff --git a/resources/tools/presentation/run_report.sh b/resources/tools/presentation/run_report.sh
index e36eee37c3..c28c03a49b 100755
--- a/resources/tools/presentation/run_report.sh
+++ b/resources/tools/presentation/run_report.sh
@@ -30,6 +30,9 @@ mkdir ${DIR[WORKING]}
virtualenv -p $(which python3) ${DIR[WORKING]}/env
source ${DIR[WORKING]}/env/bin/activate
+# FIXME: Temporary hack until all docker dns will be solved
+echo "nameserver 172.17.0.1" > /etc/resolv.conf
+
# Install python dependencies:
pip3 install -r requirements.txt
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index ece35c745c..5acef6502d 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -104,7 +104,7 @@
urls:
URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job"
- URL[S3_STORAGE,LOG]: "http://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
+ URL[S3_STORAGE,LOG]: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
URL[NEXUS,LOG]: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
URL[NEXUS,DOC]: "https://docs.fd.io/csit"
DIR[NEXUS,DOC]: "report/_static/archive"
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 8e1df77083..96584923e8 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -44,7 +44,7 @@
urls:
URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job"
- URL[S3_STORAGE,LOG]: "http://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
+ URL[S3_STORAGE,LOG]: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
URL[NEXUS,LOG]: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
URL[NEXUS,DOC]: "https://docs.fd.io/csit"
DIR[NEXUS,DOC]: "trending/_static/archive"
diff --git a/resources/tools/presentation/specification_local.yaml b/resources/tools/presentation/specification_local.yaml
index cdcb749312..95970a2fdf 100644
--- a/resources/tools/presentation/specification_local.yaml
+++ b/resources/tools/presentation/specification_local.yaml
@@ -106,7 +106,7 @@
urls:
# Urls where the input files are downloaded from
URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job"
- URL[S3_STORAGE,LOG]: "http://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
+ URL[S3_STORAGE,LOG]: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
URL[NEXUS,LOG]: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
URL[NEXUS,DOC]: "https://docs.fd.io/csit"
DIR[NEXUS,DOC]: "report/_static/archive"