Test build for #1429

SUSE · Nov 15, 2024 · bd1394f · bd1394f
1 parent 94dd225
commit bd1394f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/pcp-image/Dockerfile b/pcp-image/Dockerfile
@@ -17,11 +17,12 @@
 
 #!BuildTag: suse/pcp:6.2.0-%RELEASE%
 #!BuildTag: suse/pcp:6.2.0
+#!BuildTag: suse/pcp:6
 #!BuildTag: suse/pcp:6.2
 #!BuildTag: suse/pcp:6
 #!BuildTag: suse/pcp:latest
-#!BuildName: suse-pcp-6.2.0
-#!BuildVersion: 15.6.6.2.0
+#!BuildName: suse-pcp-6
+#!BuildVersion: 15.6.6
 #!BuildRelease: 35
 FROM bci/bci-init:15.6
 

diff --git a/pcp-image/README.md b/pcp-image/README.md
@@ -14,7 +14,7 @@ $ podman run -d \
     -p 44321:44321 \
     -p 44322:44322 \
     -v pcp-archives:/var/log/pcp/pmlogger \
-    registry.suse.com/suse/pcp:6.2.0
+    registry.suse.com/suse/pcp:6
 ```
 
 **Note:** On SELinux enabled systems, the following boolean needs to be set: `sudo setsebool -P container_manage_cgroup true`
@@ -30,7 +30,7 @@ $ sudo podman run -d \
     -e HOST_MOUNT=/host \
     -v pcp-archives:/var/log/pcp/pmlogger \
     -v /:/host:ro,rslave \
-    registry.suse.com/suse/pcp:6.2.0
+    registry.suse.com/suse/pcp:6
 ```
 
 ## Configuration
@@ -65,7 +65,7 @@ $ podman run -d \
     -e PCP_SERVICES=pmlogger \
     -v $(pwd)/pmlogger.control:/etc/pcp/pmlogger/control.d/local:z \
     -v pcp-archives:/var/log/pcp/pmlogger \
-    registry.suse.com/suse/pcp:6.2.0
+    registry.suse.com/suse/pcp:6
 ```
 
 pmlogger.control:

diff --git a/pcp-image/_service b/pcp-image/_service
@@ -1,16 +1,4 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="regex">%%pcp_major%%</param>
-    <param name="package">pcp</param>
-    <param name="parse-version">major</param>
-  </service>
-  <service name="replace_using_package_version" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="regex">%%pcp_minor%%</param>
-    <param name="package">pcp</param>
-    <param name="parse-version">minor</param>
-  </service>
 </services>