Merge pull request #393 from SUSE/sle15_lifecycle_url

Switch lifecycle url to the SLE15 specific url
SUSE · May 25, 2023 · b4ed8fa · b4ed8fa
2 parents 30e1e90 + 365b0c8
commit b4ed8fa
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/src/bci_build/package.py b/src/bci_build/package.py
@@ -229,6 +229,9 @@ class ImageProperties:
     #: Url to the vendor's home page
     url: str
 
+    #: Url to learn about the support lifecycle of the image
+    lifecycle_url: str
+
     #: The prefix of the label names ``$label_prefix.bci.$label = foobar``
     label_prefix: str
 
@@ -246,6 +249,7 @@ class ImageProperties:
     vendor="openSUSE Project",
     registry="registry.opensuse.org",
     url="https://www.opensuse.org",
+    lifecycle_url="https://en.opensuse.org/Lifetime",
     label_prefix="org.opensuse",
     distribution_base_name="openSUSE Tumbleweed",
     build_tag_prefix=_build_tag_prefix(OsVersion.TUMBLEWEED),
@@ -258,6 +262,7 @@ class ImageProperties:
     vendor="SUSE LLC",
     registry="registry.suse.com",
     url="https://www.suse.com/products/server/",
+    lifecycle_url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15",
     label_prefix="com.suse",
     distribution_base_name="SLE",
     build_tag_prefix=_build_tag_prefix(OsVersion.SP4),
@@ -451,6 +456,10 @@ def version_label(self) -> str:
     def build_version(self) -> Optional[str]:
         return "15.4" if self.os_version == OsVersion.SP4 else None
 
+    @property
+    def lifecycle_url(self) -> str:
+        return self._image_properties.lifecycle_url
+
     @property
     def release_stage(self) -> ReleaseStage:
         """This container images' release stage.

diff --git a/src/bci_build/templates.py b/src/bci_build/templates.py
@@ -28,14 +28,16 @@
 LABEL org.opencontainers.image.source="%SOURCEURL%"
 LABEL org.opensuse.reference="{{ image.reference }}"
 LABEL org.openbuildservice.disturl="%DISTURL%"
-{% if not image.is_opensuse %}LABEL com.suse.supportlevel="{{ image.support_level }}"
+{% if image.is_opensuse %}LABEL org.opensuse.lifecycle-url="{{ image.lifecycle_url }}"
+LABEL org.opensuse.release-stage="{{ image.release_stage }}"
+{% else %}LABEL com.suse.supportlevel="{{ image.support_level }}"
 {%- if image.supported_until %}
 LABEL com.suse.supportlevel.until="{{ image.supported_until }}"
 {%- endif %}
 LABEL com.suse.eula="sle-bci"
-LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle"
-LABEL com.suse.image-type="{{ image.image_type }}"{% endif %}
-LABEL com.suse.release-stage="{{ image.release_stage }}"
+LABEL com.suse.lifecycle-url="{{ image.lifecycle_url }}"
+LABEL com.suse.image-type="{{ image.image_type }}"
+LABEL com.suse.release-stage="{{ image.release_stage }}"{% endif %}
 # endlabelprefix
 {%- if image.extra_label_lines %}{{ image.extra_label_lines }}{% endif %}
 
@@ -91,8 +93,8 @@
 {%- endif %}
             <label name="com.suse.image-type" value="{{ image.image_type }}"/>
             <label name="com.suse.eula" value="sle-bci"/>{% endif %}
-            <label name="com.suse.release-stage" value="{{ image.release_stage }}"/>{% if not image.is_opensuse %}
-            <label name="com.suse.lifecycle-url" value="https://www.suse.com/lifecycle"/>{% endif %}
+            <label name="{% if image.is_opensuse %}org.opensuse{% else %}com.suse{% endif %}.release-stage" value="{{ image.release_stage }}"/>
+            <label name="{% if image.is_opensuse %}org.opensuse{% else %}com.suse{% endif %}.lifecycle-url" value="{{ image.lifecycle_url }}"/>
 {{- image.extra_label_xml_lines }}
           </suse_label_helper:add_prefix>
         </labels>

diff --git a/tests/test_build_recipe.py b/tests/test_build_recipe.py
@@ -34,7 +34,7 @@
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.supportlevel.until="2024-02-01"
 LABEL com.suse.eula="sle-bci"
-LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle"
+LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
 LABEL com.suse.image-type="sle-bci"
 LABEL com.suse.release-stage="released"
 # endlabelprefix
@@ -78,7 +78,7 @@
             <label name="com.suse.image-type" value="sle-bci"/>
             <label name="com.suse.eula" value="sle-bci"/>
             <label name="com.suse.release-stage" value="released"/>
-            <label name="com.suse.lifecycle-url" value="https://www.suse.com/lifecycle"/>
+            <label name="com.suse.lifecycle-url" value="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"/>
           </suse_label_helper:add_prefix>
         </labels>
       </containerconfig>
@@ -132,7 +132,7 @@
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="sle-bci"
-LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle"
+LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
 LABEL com.suse.image-type="sle-bci"
 LABEL com.suse.release-stage="beta"
 # endlabelprefix
@@ -173,7 +173,7 @@
             <label name="com.suse.image-type" value="sle-bci"/>
             <label name="com.suse.eula" value="sle-bci"/>
             <label name="com.suse.release-stage" value="beta"/>
-            <label name="com.suse.lifecycle-url" value="https://www.suse.com/lifecycle"/>
+            <label name="com.suse.lifecycle-url" value="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"/>
           </suse_label_helper:add_prefix>
         </labels>
       </containerconfig>
@@ -223,7 +223,7 @@
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="sle-bci"
-LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle"
+LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
 LABEL com.suse.image-type="sle-bci"
 LABEL com.suse.release-stage="released"
 # endlabelprefix
@@ -264,7 +264,7 @@
             <label name="com.suse.image-type" value="sle-bci"/>
             <label name="com.suse.eula" value="sle-bci"/>
             <label name="com.suse.release-stage" value="released"/>
-            <label name="com.suse.lifecycle-url" value="https://www.suse.com/lifecycle"/>
+            <label name="com.suse.lifecycle-url" value="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"/>
           </suse_label_helper:add_prefix>
         </labels>
       </containerconfig>
@@ -321,8 +321,9 @@
 LABEL org.opencontainers.image.source="%SOURCEURL%"
 LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/test:28.2-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
+LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime"
+LABEL org.opensuse.release-stage="released"
 
-LABEL com.suse.release-stage="released"
 # endlabelprefix
 LABEL emacs_version="28"
 LABEL GCC_version="15"
@@ -367,7 +368,8 @@
             <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/test:28.2-%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
 
-            <label name="com.suse.release-stage" value="released"/>
+            <label name="org.opensuse.release-stage" value="released"/>
+            <label name="org.opensuse.lifecycle-url" value="https://en.opensuse.org/Lifetime"/>
             <label name="emacs_version" value="28"/>
             <label name="GCC_version" value="15"/>
           </suse_label_helper:add_prefix>