diff --git a/sources/org.osbuild.ostree b/sources/org.osbuild.ostree index 89c6d04e..0e038789 100755 --- a/sources/org.osbuild.ostree +++ b/sources/org.osbuild.ostree @@ -38,6 +38,10 @@ SCHEMA = """ "type": "string", "description": "URL of the repository." }, + "contenturl": { + "type": "string", + "description": "content URL of the repository." + }, "gpgkeys": { "type": "array", "items": { @@ -107,6 +111,9 @@ class OSTreeSource(sources.SourceService): if not gpg: remote_add_args = ["--no-gpg-verify"] + if "contenturl" in remote: + remote_add_args.append(f"--contenturl={remote['contenturl']}") + if remote.get("secrets", {}).get("name") == "org.osbuild.rhsm.consumer": secrets = Subscriptions.get_consumer_secrets() remote_add_args.append(f"--set=\"tls-client-key-path={secrets['consumer_key']}\"") diff --git a/test/data/sources/org.osbuild.ostree/cases/contenturl.json b/test/data/sources/org.osbuild.ostree/cases/contenturl.json new file mode 100644 index 00000000..1bee7429 --- /dev/null +++ b/test/data/sources/org.osbuild.ostree/cases/contenturl.json @@ -0,0 +1,13 @@ +{ + "expects": "success", + "org.osbuild.ostree": { + "items": { + "d6243b0d0ca3dc2aaef2e0eb3e9f1f4836512c2921007f124b285f7c466464d8": { + "remote": { + "url": "http://localhost/sources/org.osbuild.ostree/data/meta", + "contenturl": "http://localhost/sources/org.osbuild.ostree/data/content" + } + } + } + } +} diff --git a/test/data/sources/org.osbuild.ostree/data/content/objects/25/ec43bf2d02dcbe0c21307674fd6f8e98555f600c6647b42fb1fad58436b70b.filez b/test/data/sources/org.osbuild.ostree/data/content/objects/25/ec43bf2d02dcbe0c21307674fd6f8e98555f600c6647b42fb1fad58436b70b.filez new file mode 100644 index 00000000..72b1315c Binary files /dev/null and b/test/data/sources/org.osbuild.ostree/data/content/objects/25/ec43bf2d02dcbe0c21307674fd6f8e98555f600c6647b42fb1fad58436b70b.filez differ diff --git a/test/data/sources/org.osbuild.ostree/data/content/objects/44/6a0ef11b7cc167f3b603e585c7eeeeb675faa412d5ec73f62988eb0b6c5488.dirmeta b/test/data/sources/org.osbuild.ostree/data/content/objects/44/6a0ef11b7cc167f3b603e585c7eeeeb675faa412d5ec73f62988eb0b6c5488.dirmeta new file mode 100644 index 00000000..6757a41e Binary files /dev/null and b/test/data/sources/org.osbuild.ostree/data/content/objects/44/6a0ef11b7cc167f3b603e585c7eeeeb675faa412d5ec73f62988eb0b6c5488.dirmeta differ diff --git a/test/data/sources/org.osbuild.ostree/data/content/objects/6e/adab46e44d2c96fbe0f5ccb575049de095b41ccb2b42e597e583cbc00f2e61.dirtree b/test/data/sources/org.osbuild.ostree/data/content/objects/6e/adab46e44d2c96fbe0f5ccb575049de095b41ccb2b42e597e583cbc00f2e61.dirtree new file mode 100644 index 00000000..56aac172 Binary files /dev/null and b/test/data/sources/org.osbuild.ostree/data/content/objects/6e/adab46e44d2c96fbe0f5ccb575049de095b41ccb2b42e597e583cbc00f2e61.dirtree differ diff --git a/test/data/sources/org.osbuild.ostree/data/content/objects/d6/243b0d0ca3dc2aaef2e0eb3e9f1f4836512c2921007f124b285f7c466464d8.commit b/test/data/sources/org.osbuild.ostree/data/content/objects/d6/243b0d0ca3dc2aaef2e0eb3e9f1f4836512c2921007f124b285f7c466464d8.commit new file mode 100644 index 00000000..5e0d1900 Binary files /dev/null and b/test/data/sources/org.osbuild.ostree/data/content/objects/d6/243b0d0ca3dc2aaef2e0eb3e9f1f4836512c2921007f124b285f7c466464d8.commit differ diff --git a/test/data/sources/org.osbuild.ostree/data/meta/config b/test/data/sources/org.osbuild.ostree/data/meta/config new file mode 100644 index 00000000..18e52e7a --- /dev/null +++ b/test/data/sources/org.osbuild.ostree/data/meta/config @@ -0,0 +1,3 @@ +[core] +repo_version=1 +mode=archive-z2 diff --git a/test/data/sources/org.osbuild.ostree/data/meta/refs/heads/test/ostree b/test/data/sources/org.osbuild.ostree/data/meta/refs/heads/test/ostree new file mode 100644 index 00000000..819fcaad --- /dev/null +++ b/test/data/sources/org.osbuild.ostree/data/meta/refs/heads/test/ostree @@ -0,0 +1 @@ +d6243b0d0ca3dc2aaef2e0eb3e9f1f4836512c2921007f124b285f7c466464d8 diff --git a/test/data/sources/org.osbuild.ostree/data/meta/refs/remotes/.empty b/test/data/sources/org.osbuild.ostree/data/meta/refs/remotes/.empty new file mode 100644 index 00000000..e69de29b