Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CB-27214 Base images: RHEL 8.10 + Java 8 #1049

Closed
wants to merge 3 commits into from
Closed

CB-27214 Base images: RHEL 8.10 + Java 8 #1049

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3da03ab
CB-27214 Base images: RHEL 8.10 + Java 8
Sep 17, 2024
aeafa5f
Merge branch 'master' into CB-27214
kkubina Sep 17, 2024
0539cdb
Merge branch 'master' into CB-27214
kkubina Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ OPTIONAL_STATES ?= ""
IMAGE_COPY_PHASE ?= ""
ARCHITECTURE ?= x86_64

TYPES := prewarm base freeipa
ifneq ($(filter $(IMAGE_BURNING_TYPE),$(TYPES)),)
echo "Burning $(IMAGE_BURNING_TYPE) image."
else
$(error Invalid value in IMAGE_BURNING_TYPE: $(IMAGE_BURNING_TYPE).)
endif

# Azure VM image specifications
ifeq ($(CLOUD_PROVIDER),Azure)
PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP ?= false
Expand Down Expand Up @@ -47,6 +54,8 @@ $(error "AZURE_IMAGE_VHD and Marketplace image properties (AZURE_IMAGE_PUBLISHER
# CB-26812: Temp rollback!
# AZURE_IMAGE_SKU ?= rhel-lvm10
AZURE_IMAGE_SKU ?= rhel-lvm810
else ifeq ($(IMAGE_BURNING_TYPE),base)
AZURE_IMAGE_SKU ?= rhel-lvm810
else
AZURE_IMAGE_SKU ?= rhel-lvm88
endif
Expand All @@ -73,6 +82,8 @@ ifeq ($(CLOUD_PROVIDER),AWS)
else
ifeq ($(STACK_VERSION),7.3.1)
AWS_SOURCE_AMI ?= ami-02073841a355a1e92
else ifeq ($(IMAGE_BURNING_TYPE),base)
AWS_SOURCE_AMI ?= ami-02073841a355a1e92
else
AWS_SOURCE_AMI ?= ami-039ce2eddc1949546
endif
Expand Down Expand Up @@ -100,6 +111,8 @@ ifeq ($(CLOUD_PROVIDER),GCP)
ifeq ($(OS),redhat8)
ifeq ($(STACK_VERSION),7.3.1)
GCP_SOURCE_IMAGE ?= rhel-8-byos-v20240709
else ifeq ($(IMAGE_BURNING_TYPE),base)
GCP_SOURCE_IMAGE ?= rhel-8-byos-v20240709
else
GCP_SOURCE_IMAGE ?= rhel-8-byos-v20230615
endif
Expand Down