From 05fb721c4b35458fd6ba34c1aab43dba71073b1c Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Wed, 29 Nov 2023 14:02:00 -0500
Subject: [PATCH] [8.11] [build] Rename ubi9 image to ubi (#171424) (#172208)

# Backport

This will backport the following commits from `main` to `8.11`:
- [[build] Rename ubi9 image to ubi
(#171424)](https://github.com/elastic/kibana/pull/171424)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT
[{"author":{"name":"Jon","email":"jon@elastic.co"},"sourceCommit":{"committedDate":"2023-11-29T17:50:22Z","message":"[build]
Rename ubi9 image to ubi (#171424)\n\nFuture ubi image names will be
version agnostic. Removal of ubi8
TBD.\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"0796976a274a691221d79c067f9aef947dcf37e9","branchLabelMapping":{"^v8.12.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:skip","ci:build-os-packages","backport:all-open","v8.12.0"],"number":171424,"url":"https://github.com/elastic/kibana/pull/171424","mergeCommit":{"message":"[build]
Rename ubi9 image to ubi (#171424)\n\nFuture ubi image names will be
version agnostic. Removal of ubi8
TBD.\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"0796976a274a691221d79c067f9aef947dcf37e9"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.12.0","labelRegex":"^v8.12.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/171424","number":171424,"mergeCommit":{"message":"[build]
Rename ubi9 image to ubi (#171424)\n\nFuture ubi image names will be
version agnostic. Removal of ubi8
TBD.\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"0796976a274a691221d79c067f9aef947dcf37e9"}}]}]
BACKPORT-->

Co-authored-by: Jon <jon@elastic.co>
---
 .buildkite/pipelines/artifacts.yml                      | 2 +-
 .buildkite/scripts/steps/artifacts/docker_context.sh    | 5 +++--
 src/dev/build/tasks/os_packages/docker_generator/run.ts | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipelines/artifacts.yml b/.buildkite/pipelines/artifacts.yml
index 4a52ee7402823..64ebe01e9227b 100644
--- a/.buildkite/pipelines/artifacts.yml
+++ b/.buildkite/pipelines/artifacts.yml
@@ -61,7 +61,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: KIBANA_DOCKER_CONTEXT=ubi9 .buildkite/scripts/steps/artifacts/docker_context.sh
+  - command: KIBANA_DOCKER_CONTEXT=ubi .buildkite/scripts/steps/artifacts/docker_context.sh
     label: 'Docker Context Verification'
     agents:
       queue: n2-2
diff --git a/.buildkite/scripts/steps/artifacts/docker_context.sh b/.buildkite/scripts/steps/artifacts/docker_context.sh
index 98b621bc6dd7d..19ea6bc6ea5fe 100755
--- a/.buildkite/scripts/steps/artifacts/docker_context.sh
+++ b/.buildkite/scripts/steps/artifacts/docker_context.sh
@@ -26,8 +26,9 @@ case $KIBANA_DOCKER_CONTEXT in
   ubi8)
     DOCKER_CONTEXT_FILE="kibana-ubi8-$FULL_VERSION-docker-build-context.tar.gz"
   ;;
-  ubi9)
-    DOCKER_CONTEXT_FILE="kibana-ubi9-$FULL_VERSION-docker-build-context.tar.gz"
+  ubi)
+    # Currently ubi9.  After ubi8 we're moving to a version agnostic filename
+    DOCKER_CONTEXT_FILE="kibana-ubi-$FULL_VERSION-docker-build-context.tar.gz"
   ;;
   ironbank)
     DOCKER_CONTEXT_FILE="kibana-ironbank-$FULL_VERSION-docker-build-context.tar.gz"
diff --git a/src/dev/build/tasks/os_packages/docker_generator/run.ts b/src/dev/build/tasks/os_packages/docker_generator/run.ts
index f9da19183d866..eb7a03a9e933f 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/run.ts
+++ b/src/dev/build/tasks/os_packages/docker_generator/run.ts
@@ -45,7 +45,7 @@ export async function runDockerGenerator(
 
   let imageFlavor = '';
   if (flags.baseImage === 'ubi8') imageFlavor += `-ubi8`;
-  if (flags.baseImage === 'ubi9') imageFlavor += `-ubi9`;
+  if (flags.baseImage === 'ubi9') imageFlavor += `-ubi`;
   if (flags.ironbank) imageFlavor += '-ironbank';
   if (flags.cloud) imageFlavor += '-cloud';
   if (flags.serverless) imageFlavor += '-serverless';