Merge "xci: Adapt jobs to use common prepare-tests role"

diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml
index 3a263d4..328e9e3 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yaml
+++ b/jjb/compass4nfv/compass-ci-jobs.yaml
@@ -435,7 +435,7 @@
           description: "Directory where the cache to be used during the build is located."
       - string:
           name: PPA_REPO
-          default: "http://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}"
+          default: "https://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}"
       - string:
           name: PPA_CACHE
           default: "$WORKSPACE/work/repo/"

diff --git a/jjb/compass4nfv/compass-project-jobs.yaml b/jjb/compass4nfv/compass-project-jobs.yaml
index dc935f0..b857734 100644 (file)
--- a/jjb/compass4nfv/compass-project-jobs.yaml
+++ b/jjb/compass4nfv/compass-project-jobs.yaml
@@ -129,7 +129,7 @@
           description: "URL to Google Storage."
       - string:
           name: PPA_REPO
-          default: "http://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}"
+          default: "https://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}"
       - string:
           name: PPA_CACHE
           default: "$WORKSPACE/work/repo/"

diff --git a/jjb/compass4nfv/compass-verify-jobs.yaml b/jjb/compass4nfv/compass-verify-jobs.yaml
index beb857d..f0cda82 100644 (file)
--- a/jjb/compass4nfv/compass-verify-jobs.yaml
+++ b/jjb/compass4nfv/compass-verify-jobs.yaml
@@ -334,7 +334,7 @@
           description: "URL to Google Storage."
       - string:
           name: PPA_REPO
-          default: "http://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}"
+          default: "https://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}"
       - string:
           name: PPA_CACHE
           default: "$WORKSPACE/work/repo/"

diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index 23fbe9b..739da9e 100755 (executable)
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -256,7 +256,7 @@ fi
 ubuntu_image=${image_path}/ubuntu-16.04-server-cloudimg-amd64-disk1.img
 if [[ ! -f ${ubuntu_image} ]]; then
     echo "Download image ubuntu-16.04-server-cloudimg-amd64-disk1.img ..."
-    wget -q -nc http://artifacts.opnfv.org/sdnvpn/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P ${image_path}
+    wget -q -nc https://artifacts.opnfv.org/sdnvpn/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P ${image_path}
 fi
 sudo cp ${ubuntu_image} ${DOVETAIL_IMAGES}