[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: Revert "g-i: use https"

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
2781a109 by Samuel Thibault at 2019-05-29T22:58:41Z
Revert "g-i: use https"

This reverts commit 2c37295f286d02dab14b399202566a027aa63443.

The downloader will refuse to validate the IP address with the https
certificate.

- - - - -
bdec471e by Mattia Rizzolo at 2019-05-30T07:57:57Z
Merge branch 'master' of salsa.debian.org:sthibault/jenkins.debian.net

MR: https://salsa.debian.org/qa/jenkins.debian.net/merge_requests/33
Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


2 changed files:

- bin/g-i-installation.sh
- deploy_jdn


Changes:

=====================================
bin/g-i-installation.sh
=====================================
@@ -187,7 +187,7 @@ bootstrap_system() {
 	echo "Doing g-i installation test for $NAME now."
 	# qemu related variables (incl kernel+initrd) - display first, as we grep for this in the process list
 	QEMU_OPTS="-display vnc=$DISPLAY -enable-kvm -cpu host"
-	QEMU_WEBSERVER=https://10.0.2.1/
+	QEMU_WEBSERVER=http://10.0.2.1/
 	QEMU_NET_OPTS="-net nic,vlan=0 -net user,vlan=0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254"
 	# preseeding related variables
 	PRESEEDCFG="preseed.cfg"


=====================================
deploy_jdn
=====================================
@@ -80,6 +80,7 @@ elif [ "$1" = "" ] ; then
 	echo -n "Running j.d.n.git updates on ${HOSTS[@]} now"
 elif [ "$1" = "jenkins" ] ; then
 	HOSTS=(root at jenkins.debian.net)
+	HOSTS=()
 	shift
 	for i in "$@" ; do
 		case "$i" in



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/08b024a2f8226368954f9bba83b30217262f69db...bdec471e59b69049616cedf1c183ad51242488f1

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/08b024a2f8226368954f9bba83b30217262f69db...bdec471e59b69049616cedf1c183ad51242488f1
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20190530/fd113d95/attachment.html>