PR#616: pulp: Stop stripping https - odcs

Lubomír Sedlář • a year ago

4ca2cb9

server/odcs/server/pulp.py

file modified

-4

		`@@ -170,10 +170,6 @@`
		`"""`
		`notes = raw_repo["notes"]`
		`url = self.server_url.rstrip("/") + "/" + notes["relative_url"]`
		`- # OSBS cannot verify https during the container image build, so`
		`- # fallback to http for now.`
		`- if url.startswith("https://"):`
		`- url = "http://" + url[len("https://") :]`
		`return {`
		`"id": raw_repo["id"],`
		`"url": url,`

server/tests/test_backend.py

file modified

+7 -7

		`@@ -875,31 +875,31 @@`
		`"""`
		`[foo-1]`
		`name=foo-1`
		`- baseurl=http://localhost/content/1/x86_64/os`
		`+ baseurl=https://localhost/content/1/x86_64/os`
		`enabled=1`
		`gpgcheck=0`

		`[foo-2]`
		`name=foo-2`
		`- baseurl=http://localhost/content/2/x86_64/os`
		`+ baseurl=https://localhost/content/2/x86_64/os`
		`enabled=1`
		`gpgcheck=0`

		`[foo-3]`
		`name=foo-3`
		`- baseurl=http://localhost/content/3/ppc64/os`
		`+ baseurl=https://localhost/content/3/ppc64/os`
		`enabled=1`
		`gpgcheck=0`

		`[repo4]`
		`name=repo4`
		`- baseurl=http://localhost/content/100/s390/os`
		`+ baseurl=https://localhost/content/100/s390/os`
		`enabled=1`
		`gpgcheck=0`

		`[repo5]`
		`name=repo5`
		`- baseurl=http://localhost/content/101/x86_64/os`
		`+ baseurl=https://localhost/content/101/x86_64/os`
		`enabled=1`
		`gpgcheck=0`
		`"""`
		`@@ -1085,7 +1085,7 @@`
		`"""`
		`[foo-1]`
		`name=foo-1`
		`- baseurl=http://localhost/content/1/x86_64/os`
		`+ baseurl=https://localhost/content/1/x86_64/os`
		`enabled=1`
		`gpgcheck=0`
		`"""`
		`@@ -1451,7 +1451,7 @@`
		`"""`
		`[repo1]`
		`name=repo1`
		`- baseurl=http://localhost/content/1/s390/os`
		`+ baseurl=https://localhost/content/1/s390/os`
		`enabled=1`
		`gpgcheck=0`
		`"""`