[7.17](backport #37153) ironbank: rename ubi9 to ubi image (#37205)

elastic · Nov 27, 2023 · cc0fbbe · cc0fbbe
1 parent 679300d
commit cc0fbbe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy
@@ -331,7 +331,7 @@ def linuxPlatforms() {
 def pushCIDockerImages(Map args = [:]) {
   def arch = args.get('arch', 'amd64')
   catchError(buildResult: 'UNSTABLE', message: 'Unable to push Docker images', stageResult: 'FAILURE') {
-    def defaultVariants = [ '' : 'beats', '-oss' : 'beats', '-ubi9' : 'beats' ]
+    def defaultVariants = [ '' : 'beats', '-oss' : 'beats', '-ubi' : 'beats' ]
     def completeVariant = ['-complete' : 'beats']
     // Cloud is not public available, therefore it should use the beats-ci namespace.
     def cloudVariant = ['-cloud' : 'beats-ci']

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -461,7 +461,7 @@ def pushCIDockerImages(Map args = [:]) {
   def arch = args.get('arch', 'amd64')
   def beatsFolder = args.beatsFolder
   catchError(buildResult: 'UNSTABLE', message: 'Unable to push Docker images', stageResult: 'FAILURE') {
-    def defaultVariants = [ '' : 'beats', '-oss' : 'beats', '-ubi9' : 'beats' ]
+    def defaultVariants = [ '' : 'beats', '-oss' : 'beats', '-ubi' : 'beats' ]
     def completeVariant = ['-complete' : 'beats']
     if (beatsFolder.endsWith('auditbeat')) {
       tagAndPush(beatName: 'auditbeat', arch: arch, variants: defaultVariants)

diff --git a/dev-tools/packaging/packages.yml b/dev-tools/packaging/packages.yml
@@ -667,12 +667,12 @@ shared:
 
   - &docker_ubi_spec
     extra_vars:
-      image_name: '{{.BeatName}}-ubi9'
+      image_name: '{{.BeatName}}-ubi'
       from: 'docker.elastic.co/ubi9/ubi-minimal'
 
   - &docker_arm_ubi_spec
     extra_vars:
-      image_name: '{{.BeatName}}-ubi9'
+      image_name: '{{.BeatName}}-ubi'
       from: 'registry.access.redhat.com/ubi9/ubi-minimal:9.3'
 
   - &elastic_docker_spec