From cee2ccb80dd5bb85eeebcc2e43c5cca63aeaaaa9 Mon Sep 17 00:00:00 2001 From: Charles Connell Date: Thu, 4 Apr 2024 14:12:07 -0400 Subject: [PATCH 1/3] Build with and for AlmaLinux9 --- .blazar.yaml | 3 ++- build-scripts/prepare_environment.sh | 9 ++++++--- hbase-rpm/.blazar.yaml | 11 +++++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.blazar.yaml b/.blazar.yaml index 66238b9b52f3..50c878275c4c 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -10,7 +10,8 @@ env: # The build environment requires environment variables to be explicitly defined before they may # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable # throughout a build - YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8: "" + EL8_REPO_NAME: "" + EL9_REPO_NAME: "" SET_VERSION: "" HBASE_VERSION: "" PKG_RELEASE: "" diff --git a/build-scripts/prepare_environment.sh b/build-scripts/prepare_environment.sh index 1a59f8f6ede3..b4740e6a400a 100755 --- a/build-scripts/prepare_environment.sh +++ b/build-scripts/prepare_environment.sh @@ -65,11 +65,13 @@ RELEASE="hs" if [[ "$GIT_BRANCH" = "$MAIN_BRANCH" ]]; then SET_VERSION="${MINOR_VERSION}-hubspot-SNAPSHOT" - YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8="8_hs-hbase" + EL8_REPO_NAME="8_hs-hbase" + EL9_REPO_NAME="9_hs-hbase" elif [[ "$GIT_BRANCH" != "hubspot" ]]; then SET_VERSION="${MINOR_VERSION}-${GIT_BRANCH}-SNAPSHOT" RELEASE="${RELEASE}~${GIT_BRANCH//[^[:alnum:]]/_}" - YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8="8_hs-hbase-develop" + EL8_REPO_NAME="8_hs-hbase-develop" + EL9_REPO_NAME="9_hs-hbase-develop" else echo "Invalid git branch $GIT_BRANCH" exit 1 @@ -83,7 +85,8 @@ write-build-env-var SET_VERSION "$SET_VERSION" write-build-env-var HBASE_VERSION "$HBASE_VERSION" write-build-env-var PKG_RELEASE "$RELEASE" write-build-env-var FULL_BUILD_VERSION "$FULL_BUILD_VERSION" -write-build-env-var YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8 "$YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8" +write-build-env-var EL8_REPO_NAME "$EL8_REPO_NAME" +write-build-env-var EL9_REPO_NAME "$EL9_REPO_NAME" # Adding this value as versioninfo.version ensures we have the same value as would normally # show up in a non-hubspot hbase build. Otherwise due to set-maven-versions we'd end up # with 2.6-hubspot-SNAPSHOT which is not very useful as a point of reference. diff --git a/hbase-rpm/.blazar.yaml b/hbase-rpm/.blazar.yaml index 67e6eaa55766..86de32de61ba 100644 --- a/hbase-rpm/.blazar.yaml +++ b/hbase-rpm/.blazar.yaml @@ -1,21 +1,24 @@ buildpack: - name: Blazar-Buildpack-RPM + name: Buildpack-RPMs env: RPM_BUILD_COMMAND: ./build.sh - DISABLE_CENTOS_6_RPMS: "true" - ENABLE_CENTOS_8_RPMS: "true" # Below variables are generated in prepare_environment.sh. # The build environment requires environment variables to be explicitly defined before they may # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable # throughout a build - YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8: "" + EL8_REPO_NAME: "" + EL9_REPO_NAME: "" SET_VERSION: "" HBASE_VERSION: "" PKG_RELEASE: "" FULL_BUILD_VERSION: "" MAVEN_BUILD_ARGS: "" +enableBuildTargets: + - centos8_amd64 + - almalinux9_amd64 + depends: - hbase From 2d96b30e6153e77cf0dbfb002ec37fbcfb1acdc6 Mon Sep 17 00:00:00 2001 From: Charles Connell Date: Thu, 4 Apr 2024 15:52:25 -0400 Subject: [PATCH 2/3] only one build target, different REPO_NAME --- .blazar.yaml | 3 +-- build-scripts/prepare_environment.sh | 9 +++------ hbase-rpm/.blazar.yaml | 4 +--- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.blazar.yaml b/.blazar.yaml index 50c878275c4c..ba76a6286acf 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -10,8 +10,7 @@ env: # The build environment requires environment variables to be explicitly defined before they may # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable # throughout a build - EL8_REPO_NAME: "" - EL9_REPO_NAME: "" + REPO_NAME: "" SET_VERSION: "" HBASE_VERSION: "" PKG_RELEASE: "" diff --git a/build-scripts/prepare_environment.sh b/build-scripts/prepare_environment.sh index b4740e6a400a..ad1e8add15bf 100755 --- a/build-scripts/prepare_environment.sh +++ b/build-scripts/prepare_environment.sh @@ -65,13 +65,11 @@ RELEASE="hs" if [[ "$GIT_BRANCH" = "$MAIN_BRANCH" ]]; then SET_VERSION="${MINOR_VERSION}-hubspot-SNAPSHOT" - EL8_REPO_NAME="8_hs-hbase" - EL9_REPO_NAME="9_hs-hbase" + REPO_NAME="AnyLinuxVersion_hs-hbase" elif [[ "$GIT_BRANCH" != "hubspot" ]]; then SET_VERSION="${MINOR_VERSION}-${GIT_BRANCH}-SNAPSHOT" RELEASE="${RELEASE}~${GIT_BRANCH//[^[:alnum:]]/_}" - EL8_REPO_NAME="8_hs-hbase-develop" - EL9_REPO_NAME="9_hs-hbase-develop" + REPO_NAME="AnyLinuxVersion_hs-hbase-develop" else echo "Invalid git branch $GIT_BRANCH" exit 1 @@ -85,8 +83,7 @@ write-build-env-var SET_VERSION "$SET_VERSION" write-build-env-var HBASE_VERSION "$HBASE_VERSION" write-build-env-var PKG_RELEASE "$RELEASE" write-build-env-var FULL_BUILD_VERSION "$FULL_BUILD_VERSION" -write-build-env-var EL8_REPO_NAME "$EL8_REPO_NAME" -write-build-env-var EL9_REPO_NAME "$EL9_REPO_NAME" +write-build-env-var REPO_NAME "$REPO_NAME" # Adding this value as versioninfo.version ensures we have the same value as would normally # show up in a non-hubspot hbase build. Otherwise due to set-maven-versions we'd end up # with 2.6-hubspot-SNAPSHOT which is not very useful as a point of reference. diff --git a/hbase-rpm/.blazar.yaml b/hbase-rpm/.blazar.yaml index 86de32de61ba..b473573bbccc 100644 --- a/hbase-rpm/.blazar.yaml +++ b/hbase-rpm/.blazar.yaml @@ -7,8 +7,7 @@ env: # The build environment requires environment variables to be explicitly defined before they may # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable # throughout a build - EL8_REPO_NAME: "" - EL9_REPO_NAME: "" + REPO_NAME: "" SET_VERSION: "" HBASE_VERSION: "" PKG_RELEASE: "" @@ -17,7 +16,6 @@ env: enableBuildTargets: - centos8_amd64 - - almalinux9_amd64 depends: - hbase From 0f6d4ec0a2c2d697bc1c67b8dc6d62f6b4bb7304 Mon Sep 17 00:00:00 2001 From: Charles Connell Date: Mon, 8 Apr 2024 14:33:49 -0400 Subject: [PATCH 3/3] missed some spots --- hubspot-client-bundles/.blazar.yaml | 2 +- hubspot-client-bundles/hbase-backup-restore-bundle/.blazar.yaml | 2 +- hubspot-client-bundles/hbase-client-bundle/.blazar.yaml | 2 +- hubspot-client-bundles/hbase-mapreduce-bundle/.blazar.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hubspot-client-bundles/.blazar.yaml b/hubspot-client-bundles/.blazar.yaml index 4e5f77586d92..a57d5eeb071b 100644 --- a/hubspot-client-bundles/.blazar.yaml +++ b/hubspot-client-bundles/.blazar.yaml @@ -6,7 +6,7 @@ env: # The build environment requires environment variables to be explicitly defined before they may # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable # throughout a build - YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8: "" + REPO_NAME: "" SET_VERSION: "" HBASE_VERSION: "" PKG_RELEASE: "" diff --git a/hubspot-client-bundles/hbase-backup-restore-bundle/.blazar.yaml b/hubspot-client-bundles/hbase-backup-restore-bundle/.blazar.yaml index c8cf3cf96e6f..9399e5dc0aa4 100644 --- a/hubspot-client-bundles/hbase-backup-restore-bundle/.blazar.yaml +++ b/hubspot-client-bundles/hbase-backup-restore-bundle/.blazar.yaml @@ -6,7 +6,7 @@ env: # The build environment requires environment variables to be explicitly defined before they may # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable # throughout a build - YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8: "" + REPO_NAME: "" SET_VERSION: "" HBASE_VERSION: "" PKG_RELEASE: "" diff --git a/hubspot-client-bundles/hbase-client-bundle/.blazar.yaml b/hubspot-client-bundles/hbase-client-bundle/.blazar.yaml index 70b6be595ce4..300be28892e8 100644 --- a/hubspot-client-bundles/hbase-client-bundle/.blazar.yaml +++ b/hubspot-client-bundles/hbase-client-bundle/.blazar.yaml @@ -6,7 +6,7 @@ env: # The build environment requires environment variables to be explicitly defined before they may # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable # throughout a build - YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8: "" + REPO_NAME: "" SET_VERSION: "" HBASE_VERSION: "" PKG_RELEASE: "" diff --git a/hubspot-client-bundles/hbase-mapreduce-bundle/.blazar.yaml b/hubspot-client-bundles/hbase-mapreduce-bundle/.blazar.yaml index b03937567698..5c020e374927 100644 --- a/hubspot-client-bundles/hbase-mapreduce-bundle/.blazar.yaml +++ b/hubspot-client-bundles/hbase-mapreduce-bundle/.blazar.yaml @@ -6,7 +6,7 @@ env: # The build environment requires environment variables to be explicitly defined before they may # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable # throughout a build - YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8: "" + REPO_NAME: "" SET_VERSION: "" HBASE_VERSION: "" PKG_RELEASE: ""