[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] d-i: remove duplicated https://'s

[Mattia Rizzolo]

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


Commits:
a2f3e93b by Philip Hands at 2018-05-29T15:48:42+02:00
d-i: remove duplicated https://'s

introduced in 0a8b1c0e

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


3 changed files:

- TODO
- bin/d-i_check_jobs.sh
- job-cfg/d-i.yaml.py


Changes:

=====================================
TODO
=====================================
--- a/TODO
+++ b/TODO
@@ -57,7 +57,7 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
 * use static IP for the nodes (h01ger)
 * use vmdebootstrap where applicable
 * Tango Icons are gone: #824477 - update footer once this bug is fixed
-* this is outdated with salsa: add to all git post-receive hooks: `curl -s "https://jenkins.debian.net/git/notifyCommit?url=https://https://salsa.debian.org/installer-team/$(basename $PWD .git)"` which will trigger jenkins to pull (check) that git repo…
+* this is outdated with salsa: add to all git post-receive hooks: `curl -s "https://jenkins.debian.net/git/notifyCommit?url=https://salsa.debian.org/installer-team/$(basename $PWD .git)"` which will trigger jenkins to pull (check) that git repo…
 * salsa stuff:
 ** triggers for d-i repos are missing
 


=====================================
bin/d-i_check_jobs.sh
=====================================
--- a/bin/d-i_check_jobs.sh
+++ b/bin/d-i_check_jobs.sh
@@ -37,9 +37,9 @@ PACKAGES=$( grep salsa.debian.org/installer/team $TMPFILE|cut -d "/" -f6-|cut -d
 # check for each git repo if a jenkins job exists
 #
 for PACKAGE in $PACKAGES ; do
-	if grep -A 1 https://https://salsa.debian.org/installer-team/$PACKAGE $TMPFILE | grep -q "deleted = true" ; then
+	if grep -A 1 https://salsa.debian.org/installer-team/$PACKAGE $TMPFILE | grep -q "deleted = true" ; then
 		# ignore deleted repos
-		echo "Info: https://https://salsa.debian.org/installer-team/$PACKAGE ignored as it has been deleted."
+		echo "Info: https://salsa.debian.org/installer-team/$PACKAGE ignored as it has been deleted."
 		continue
 	elif [ ! -d ~jenkins/jobs/${DI_BUILD_JOB_PATTERN}${PACKAGE} ] ; then
 		echo "Warning: No build job '${DI_BUILD_JOB_PATTERN}${PACKAGE}'."
@@ -48,7 +48,7 @@ for PACKAGE in $PACKAGES ; do
 		# prepare yaml bits
 		#
 		echo "      - '{name}_build_$PACKAGE':" >> $PROJECT_JOBS
-		echo "         gitrepo: 'https://https://salsa.debian.org/installer-team/$PACKAGE'" >> $PROJECT_JOBS
+		echo "         gitrepo: 'https://salsa.debian.org/installer-team/$PACKAGE'" >> $PROJECT_JOBS
 		echo "- job-template:" >> $JOB_TEMPLATES
 		echo "    defaults: d-i-build" >> $JOB_TEMPLATES
 		echo "    name: '{name}_build_$PACKAGE'" >> $JOB_TEMPLATES
@@ -63,16 +63,16 @@ echo
 echo "Checking if there are jenkins jobs for which there is no repo in $URL - or only a deleted one."
 for JOB in $(ls -1 ~jenkins/jobs/ | grep ${DI_BUILD_JOB_PATTERN}) ; do
 	REPONAME=${JOB:10}
-	if grep -q https://https://salsa.debian.org/installer-team/$REPONAME $TMPFILE ; then
-		if grep -A 1 https://https://salsa.debian.org/installer-team/$REPONAME $TMPFILE | grep -q "deleted = true" ; then
+	if grep -q https://salsa.debian.org/installer-team/$REPONAME $TMPFILE ; then
+		if grep -A 1 https://salsa.debian.org/installer-team/$REPONAME $TMPFILE | grep -q "deleted = true" ; then
 			echo "Warning: Job $JOB exists, but has 'deleted = true' set in .mrconfig."
-			if ! grep -q "'https://https://salsa.debian.org/installer-team/$REPONAME'" /srv/jenkins/job-cfg/d-i.yaml ; then
+			if ! grep -q "'https://salsa.debian.org/installer-team/$REPONAME'" /srv/jenkins/job-cfg/d-i.yaml ; then
 				echo "jenkins-jobs delete $JOB" >> $CLEANUP
 			else
 				echo "# Please remove $JOB from job-cfg/d-i.yaml before deleting the job." >> $CLEANUP
 			fi
 		else
-			echo "Ok: Job $JOB for https://https://salsa.debian.org/installer-team/$REPONAME found."
+			echo "Ok: Job $JOB for https://salsa.debian.org/installer-team/$REPONAME found."
 		fi
 	else
 		echo "Warning: Git repo $REPONAME not found in $URL, but job $JOB exists."


=====================================
job-cfg/d-i.yaml.py
=====================================
--- a/job-cfg/d-i.yaml.py
+++ b/job-cfg/d-i.yaml.py
@@ -169,7 +169,7 @@ if "jenkins-test-vm" == os.uname()[1]:
 
 # add a special job for triggering from the pu/ branches
 jobs.append( {'{name}_pu-triggered_{pkg}': {
-                'gitrepo': 'https://https://salsa.debian.org/installer-team/{pkg}',
+                'gitrepo': 'https://salsa.debian.org/installer-team/{pkg}',
                 'branchdesc': 'master branch',
                 'branch': 'origin/pu/**',
                 'pkg': 'debian-installer',
@@ -460,7 +460,7 @@ data.append(
     {'job-group': {
         'name': '{name}_build-group',
         'jobs': ['{name}_{act}_{pkg}'],
-        'gitrepo': 'https://https://salsa.debian.org/installer-team/{pkg}',
+        'gitrepo': 'https://salsa.debian.org/installer-team/{pkg}',
         'act': 'build',
         'branchdesc': 'master branch',
         'branch': 'origin/master',
@@ -471,7 +471,7 @@ data.append(
     {'job-group': {
         'name': '{name}_pu-build-group',
         'jobs': ['{name}_pu-{act}_{pkg}'],
-        'gitrepo': 'https://https://salsa.debian.org/installer-team/{pkg}',
+        'gitrepo': 'https://salsa.debian.org/installer-team/{pkg}',
         'act': 'build',
         'branchdesc': 'pu/ branches',
         'branch': 'origin/pu/**',



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/a2f3e93bf247780d5d90646330a67a93338a7afc

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/a2f3e93bf247780d5d90646330a67a93338a7afc
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/20180529/8bcd0594/attachment-0001.html>