Merge pull request #1633 from SUSE/use_obs

Use OBS repositories also for docker/podman builds

Author: dirkmueller

src/bci_build/templates.py

@@ -27,8 +27,8 @@
 DOCKERFILE_TEMPLATE = jinja2.Template(
     """# SPDX-License-Identifier: {{ image.license }}
 {{ INFOHEADER }}
-{% if image.exclusive_arch %}#!ExclusiveArch: {% for arch in image.exclusive_arch %}{{ arch }}{{ " " if not loop.last }}{% endfor %}
-{%- endif %}
+#!UseOBSRepositories
+{% if image.exclusive_arch %}#!ExclusiveArch: {% for arch in image.exclusive_arch %}{{ arch }}{{ " " if not loop.last }}{% endfor %}{%- endif %}
 {% for tag in image.build_tags -%}
 #!BuildTag: {{ tag }}
 {% endfor -%}

tests/test_build_recipe.py

@@ -20,6 +20,7 @@
         (
             """# SPDX-License-Identifier: MIT
 # Copyright header
+#!UseOBSRepositories
 
 #!BuildTag: bci/test:27
 #!BuildTag: bci/test:27-%RELEASE%
@@ -123,6 +124,7 @@
         (
             """# SPDX-License-Identifier: MIT
 # Copyright header
+#!UseOBSRepositories
 
 #!BuildTag: bci/test:stable
 #!BuildTag: bci/test:stable-1.%RELEASE%
@@ -221,6 +223,7 @@
         (
             """# SPDX-License-Identifier: MIT
 # Copyright header
+#!UseOBSRepositories
 
 #!BuildTag: bci/test:29
 #!BuildTag: bci/test:29-%RELEASE%
@@ -318,6 +321,7 @@
         (
             """# SPDX-License-Identifier: BSD
 # Copyright header
+#!UseOBSRepositories
 #!ExclusiveArch: x86_64 s390x
 #!BuildTag: opensuse/bci/test:28.2
 #!BuildTag: opensuse/bci/test:28.2-%RELEASE%