From ba608b2971b916f66005811addb688648a3c28d8 Mon Sep 17 00:00:00 2001 From: Colin Hutchinson Date: Mon, 7 Nov 2022 20:14:10 +0000 Subject: [PATCH] feat(amazonlinux-2022): support and test amazonlinux 2022 --- Jenkinsfile | 10 ++++++---- fpm-entrypoint.sh | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6da38432..500fabda 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,10 +58,11 @@ pipeline { sh 'curl https://raw.githubusercontent.com/Kong/kong/master/scripts/setup-ci.sh | bash' sh 'git clone --recursive --single-branch --branch ${KONG_SOURCE} https://github.com/Kong/kong-ee.git ${KONG_SOURCE_LOCATION}' sh 'cp $PRIVATE_KEY_FILE kong.private.gpg-key.asc' - sh 'make RESTY_IMAGE_BASE=amazonlinux RESTY_IMAGE_TAG=2 package-kong test cleanup' - sh 'make RESTY_IMAGE_BASE=centos RESTY_IMAGE_TAG=7 package-kong test cleanup' - sh 'make RESTY_IMAGE_BASE=rhel RESTY_IMAGE_TAG=7.9 package-kong test cleanup' - sh 'make RESTY_IMAGE_BASE=rhel RESTY_IMAGE_TAG=8.6 package-kong test cleanup' + sh 'make RESTY_IMAGE_BASE=amazonlinux RESTY_IMAGE_TAG=2 package-kong test cleanup' + sh 'make RESTY_IMAGE_BASE=amazonlinux RESTY_IMAGE_TAG=2022 package-kong test cleanup' + sh 'make RESTY_IMAGE_BASE=centos RESTY_IMAGE_TAG=7 package-kong test cleanup' + sh 'make RESTY_IMAGE_BASE=rhel RESTY_IMAGE_TAG=7.9 package-kong test cleanup' + sh 'make RESTY_IMAGE_BASE=rhel RESTY_IMAGE_TAG=8.6 package-kong test cleanup' } } stage('Kong Enterprise src & Alpine'){ @@ -229,6 +230,7 @@ pipeline { sh 'git clone --single-branch --branch ${KONG_SOURCE} https://github.com/Kong/kong.git ${KONG_SOURCE_LOCATION}' sh 'cp $PRIVATE_KEY_FILE kong.private.gpg-key.asc' sh 'make RESTY_IMAGE_BASE=amazonlinux RESTY_IMAGE_TAG=2 package-kong test cleanup' + sh 'make RESTY_IMAGE_BASE=amazonlinux RESTY_IMAGE_TAG=2022 package-kong test cleanup' sh 'make RESTY_IMAGE_BASE=centos RESTY_IMAGE_TAG=7 package-kong test cleanup' sh 'make RESTY_IMAGE_BASE=rhel RESTY_IMAGE_TAG=7.9 package-kong test cleanup' sh 'make RESTY_IMAGE_BASE=rhel RESTY_IMAGE_TAG=8.6 package-kong test cleanup' diff --git a/fpm-entrypoint.sh b/fpm-entrypoint.sh index b78fc210..c526e20e 100755 --- a/fpm-entrypoint.sh +++ b/fpm-entrypoint.sh @@ -64,6 +64,9 @@ elif [ "$PACKAGE_TYPE" == "rpm" ]; then if [ "$RESTY_IMAGE_BASE" == "amazonlinux" ]; then OUTPUT_FILE_SUFFIX=".aws" FPM_PARAMS="$FPM_PARAMS -d /usr/sbin/useradd -d /usr/sbin/groupadd" + if [ "$RESTY_IMAGE_TAG" == "2022" ]; then + FPM_PARAMS="$FPM_PARAMS -d libxcrypt-compat" + fi fi if [ "$RESTY_IMAGE_BASE" == "centos" ]; then OUTPUT_FILE_SUFFIX=".el${RESTY_IMAGE_TAG}"