You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bb...@apache.org on 2022/12/15 17:04:40 UTC

[hbase] 60/91: Upload RPMs to OS-based repos (#17)

This is an automated email from the ASF dual-hosted git repository.

bbeaudreault pushed a commit to branch hubspot-2
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit ed527a81b048881d4c0a080e53454a537728ccb0
Author: Chris Ayoub <ch...@gmail.com>
AuthorDate: Tue Jun 28 07:33:17 2022 -0700

    Upload RPMs to OS-based repos (#17)
---
 build-scripts/prepare_environment.sh | 10 +++++-----
 hbase-assembly/.blazar.yaml          |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build-scripts/prepare_environment.sh b/build-scripts/prepare_environment.sh
index e54528bee8b..b0864cd0012 100755
--- a/build-scripts/prepare_environment.sh
+++ b/build-scripts/prepare_environment.sh
@@ -19,12 +19,12 @@ else
 fi
 
 MAIN_BRANCH="hubspot-2"
-MAIN_YUM_REPO="6_hs-hbase"
-DEVELOP_YUM_REPO="6_hs-hbase-develop"
+MAIN_YUM_REPO="hs-hbase"
+DEVELOP_YUM_REPO="hs-hbase-develop"
 
 # If we bump our hadoop build version, we should bump this as well
 # At some point it would be good to more closely link this to our hadoop build, but that can only happen
-# once we update our apache-hadoop build to do a full maven. At which point we can probably change this to 
+# once we update our apache-hadoop build to do a full maven. At which point we can probably change this to
 # like 3.0-hubspot-SNAPSHOT and leave it at that.
 MAVEN_ARGS="$VERSION_ARGS -Dgpg.skip=true -DskipTests=true"
 
@@ -54,7 +54,7 @@ cat $WORKSPACE/pom.xml | sed '2 s/xmlns=".*"//g' > pom.xml.tmp
 HBASE_VERSION=$(echo "cat /project/version/text()" | xmllint --nocdata --shell pom.xml.tmp | sed '1d;$d')
 rm pom.xml.tmp
 
-# sanity check that we've got some that looks right. it wouldn't be the end of the world if we got it wrong, but 
+# sanity check that we've got some that looks right. it wouldn't be the end of the world if we got it wrong, but
 # will help avoid confusion.
 if [[ ! "$HBASE_VERSION" =~ 2\.[0-9]+\.[0-9]+ ]]; then
     echo "Unexpected HBASE_Version extracted from pom.xml. Got $HBASE_VERSION but expected a string like '2.4.3', with 3 numbers separated by decimals, the first number being 2."
@@ -89,7 +89,7 @@ fi
 RELEASE="${RELEASE}.${BUILD_NUMBER}"
 FULL_BUILD_VERSION="${HBASE_VERSION}-${RELEASE}"
 
-# Add into MAVEN_ARGS because we added this property in hbase-common/pom.xml so we 
+# Add into MAVEN_ARGS because we added this property in hbase-common/pom.xml so we
 # could accurately reflect the full build version in the UI and elsewhere.
 MAVEN_ARGS="$MAVEN_ARGS -Dhubspot.build.version=$HBASE_VERSION"
 
diff --git a/hbase-assembly/.blazar.yaml b/hbase-assembly/.blazar.yaml
index 1b2113546a6..f624e021900 100644
--- a/hbase-assembly/.blazar.yaml
+++ b/hbase-assembly/.blazar.yaml
@@ -33,5 +33,7 @@ after:
 
     - description: "Publish RPM"
       commands:
-        - echo "Will upload to $YUM_REPO"
-        - rpm-upload --rpms-dir=$WORKSPACE/generated_rpms/ --repo-name $YUM_REPO
+        - echo "Will upload to 6_${YUM_REPO}"
+        - rpm-upload --rpms-dir=$WORKSPACE/generated_rpms/ --repo-name 6_${YUM_REPO}
+        - echo "Will upload to 8_${YUM_REPO}"
+        - rpm-upload --rpms-dir=$WORKSPACE/generated_rpms/ --repo-name 8_${YUM_REPO}