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

Change rpm package file to match rename #1666

Merged
merged 2 commits into from
Oct 29, 2020
Merged

Change rpm package file to match rename #1666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52346b2
Change rpm package file to match rename
Oct 29, 2020
f4bd3cf
Merge branch 'rel/beta' into rename
onetechnical Oct 29, 2020
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
2 changes: 0 additions & 2 deletions scripts/release/mule/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ These env vars generally don't change between stages. Here is a list of variable

- customizable environment variables:

+ `ARCH_BIT`, i.e., the value from `uname -m`
+ `NETWORK`
+ `S3_SOURCE`, i.e., the S3 bucket from which to download
+ `SHA`, i.e., the value from `git rev-parse HEAD` if not passed on CLI
Expand All @@ -85,7 +84,6 @@ These env vars generally don't change between stages. Here is a list of variable

- customizable environment variables:

+ `ARCH_BIT`, i.e., the value from `uname -m`
+ `S3_SOURCE`, i.e., the S3 bucket from which to download

### `mule` jobs
Expand Down
12 changes: 2 additions & 10 deletions scripts/release/mule/sign/sign.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ echo
date "+build_release begin SIGN stage %Y%m%d_%H%M%S"
echo

ARCH_BIT=$(uname -m)
ARCH_TYPE=$(./scripts/archtype.sh)
OS_TYPE=$(./scripts/ostype.sh)
VERSION=${VERSION:-$(./scripts/compute_build_number.sh -f)}
Expand All @@ -25,19 +24,12 @@ STATUSFILE="build_status_${CHANNEL}_${VERSION}"
find /root/.gnupg -type d -exec chmod 700 {} \;
find /root/.gnupg -type f -exec chmod 600 {} \;

mkdir -p "$PKG_DIR"
cd "$PKG_DIR"

if [ -n "$S3_SOURCE" ]
then
PREFIX="$S3_SOURCE/$CHANNEL/$VERSION"

# deb
aws s3 cp "s3://$PREFIX/algorand_${CHANNEL}_${OS_TYPE}-${ARCH_TYPE}_${VERSION}.deb" .
aws s3 cp "s3://$PREFIX/algorand-devtools_${CHANNEL}_${OS_TYPE}-${ARCH_TYPE}_${VERSION}.deb" .

# rpm
aws s3 cp "s3://$PREFIX/algorand-${VERSION}-1.${ARCH_BIT}.rpm" .
aws s3 cp "s3://$PREFIX/algorand-devtools-${VERSION}-1.${ARCH_BIT}.rpm" .
aws s3 sync "s3://$S3_SOURCE/$CHANNEL/$VERSION/$OS_TYPE/$ARCH_TYPE/" .
fi

# TODO: "$PKG_TYPE" == "source"
Expand Down
10 changes: 4 additions & 6 deletions scripts/release/mule/test/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
set -ex

export PKG_TYPE="$1"
ARCH_BIT=$(uname -m)
export ARCH_BIT
ARCH_TYPE=$(./scripts/archtype.sh)
export ARCH_TYPE
OS_TYPE=$(./scripts/ostype.sh)
Expand All @@ -30,8 +28,8 @@ then
aws s3 cp "s3://$PREFIX/algorand-devtools_${CHANNEL}_${OS_TYPE}-${ARCH_TYPE}_${VERSION}.deb" .

# rpm
aws s3 cp "s3://$PREFIX/algorand-$VERSION-1.$ARCH_BIT.rpm" .
aws s3 cp "s3://$PREFIX/algorand-devtools-$VERSION-1.$ARCH_BIT.rpm" .
aws s3 cp "s3://$PREFIX/algorand-$CHANNEL-$VERSION-1.$ARCH_TYPE.rpm" .
aws s3 cp "s3://$PREFIX/algorand-devtools-$CHANNEL-$VERSION-1.$ARCH_TYPE.rpm" .
fi

popd
Expand All @@ -52,8 +50,8 @@ else
# Normally, this is installed for us b/c it's a dependency.
# See `./installer/rpm/algorand/algorand.spec`.
yum install yum-cron -y
rpm -i algorand-"$VERSION"-1."$ARCH_BIT".rpm
rpm -i algorand-devtools-"$VERSION"-1."$ARCH_BIT".rpm
rpm -i algorand-"$VERSION"-1."$ARCH_TYPE".rpm
rpm -i algorand-devtools-"$VERSION"-1."$ARCH_TYPE".rpm
fi

popd
Expand Down
2 changes: 1 addition & 1 deletion scripts/release/mule/test/tests/pre/verify_control_files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ else
# attempt to generate the .spec file, but it doesn't give us the info we need.
#
# Instead, we'll just install using `dpkg` and grep the error stream.
if ! rpm -i "./tmp/node_pkgs/$OS_TYPE/$ARCH_TYPE/algorand-devtools-$VERSION"*"$ARCH_BIT".rpm 2> "$RPMTMP/rpm.install"
if ! rpm -i "./tmp/node_pkgs/$OS_TYPE/$ARCH_TYPE/algorand-devtools-$VERSION"*"$ARCH_TYPE".rpm 2> "$RPMTMP/rpm.install"
then
#
# We're looking for lines that looks like the following:
Expand Down