Skip to content

Commit 3bffb0e

Browse files
dkijaniadkijania
authored
Merge pull request #17536 from MinaProtocol/dkijania/relman_add_suffix_to_archive
[Release] support newly added suffix to archive node
2 parents 0282259 + cda9fde commit 3bffb0e

File tree

2 files changed

+26
-15
lines changed

2 files changed

+26
-15
lines changed

‎buildkite/scripts/release/manager.sh‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,9 @@ function get_suffix() {
147147
mina-rosetta)
148148
echo "-$__network"
149149
;;
150-
150+
mina-archive)
151+
echo "-$__network"
152+
;;
151153
*)
152154
echo ""
153155
;;
@@ -176,7 +178,9 @@ function get_artifact_with_suffix() {
176178
mina-rosetta)
177179
echo "mina-rosetta-$__network"
178180
;;
179-
181+
mina-archive)
182+
echo "mina-archive-$__network"
183+
;;
180184
*)
181185
echo "$__artifact"
182186
;;
@@ -735,7 +739,7 @@ function publish(){
735739
$__dry_run \
736740
$__backend \
737741
$__debian_repo \
738-
$__debian_sign_key
742+
"$__debian_sign_key"
739743
fi
740744

741745
if [[ $__only_debians == 0 ]]; then
@@ -744,23 +748,25 @@ function publish(){
744748

745749
;;
746750
mina-archive)
751+
for network in "${__networks_arr[@]}"; do
747752
if [[ $__only_dockers == 0 ]]; then
748753
publish_debian $artifact \
749754
$__codename \
750755
$__source_version \
751756
$__target_version \
752757
$__channel \
753-
"" \
758+
$network \
754759
$__verify \
755760
$__dry_run \
756761
$__backend \
757762
$__debian_repo \
758-
$__debian_sign_key
763+
"$__debian_sign_key"
759764
fi
760765

761766
if [[ $__only_debians == 0 ]]; then
762-
promote_and_verify_docker $artifact $__source_version $__target_version $__codename "" $__publish_to_docker_io $__verify $__dry_run
767+
promote_and_verify_docker $artifact $__source_version $__target_version $__codename $network $__publish_to_docker_io $__verify $__dry_run
763768
fi
769+
done
764770
;;
765771
mina-rosetta)
766772
for network in "${__networks_arr[@]}"; do
@@ -775,7 +781,7 @@ function publish(){
775781
$__dry_run \
776782
$__backend \
777783
$__debian_repo \
778-
$__debian_sign_key
784+
"$__debian_sign_key"
779785
fi
780786

781787
if [[ $__only_debians == 0 ]]; then
@@ -796,7 +802,7 @@ function publish(){
796802
$__dry_run \
797803
$__backend \
798804
$__debian_repo \
799-
$__debian_sign_key
805+
"$__debian_sign_key"
800806
fi
801807

802808
if [[ $__only_debians == 0 ]]; then
@@ -1031,23 +1037,25 @@ function promote(){
10311037

10321038
;;
10331039
mina-archive)
1040+
for network in "${__networks_arr[@]}"; do
10341041
if [[ $__only_dockers == 0 ]]; then
10351042
promote_debian $artifact \
10361043
$__codename \
10371044
$__source_version \
10381045
$__target_version \
10391046
$__source_channel \
10401047
$__target_channel \
1041-
"" \
1048+
$network \
10421049
$__verify \
10431050
$__dry_run \
10441051
$__debian_repo \
10451052
$__debian_sign_key
10461053
fi
10471054

10481055
if [[ $__only_debians == 0 ]]; then
1049-
promote_and_verify_docker $artifact $__source_version $__target_version $__codename "" $__publish_to_docker_io $__verify $__dry_run
1056+
promote_and_verify_docker $artifact $__source_version $__target_version $__codename $network $__publish_to_docker_io $__verify $__dry_run
10501057
fi
1058+
done
10511059
;;
10521060
mina-rosetta)
10531061
for network in "${__networks_arr[@]}"; do
@@ -1271,9 +1279,13 @@ function verify(){
12711279

12721280
;;
12731281
mina-archive)
1282+
for network in "${__networks_arr[@]}"; do
1283+
local __artifact_full_name
1284+
__artifact_full_name=$(get_artifact_with_suffix $artifact $network)
1285+
12741286
if [[ $__only_dockers == 0 ]]; then
12751287
echo " 📋 Verifying: $artifact debian on $__channel channel with $__version version for $__codename codename"
1276-
1288+
12771289
prefix_cmd "$SUBCOMMAND_TAB" $SCRIPTPATH/../../../scripts/debian/verify.sh \
12781290
-p $artifact \
12791291
--version $__version \
@@ -1286,8 +1298,6 @@ function verify(){
12861298
fi
12871299

12881300
if [[ $__only_debians == 0 ]]; then
1289-
local __artifact_full_name
1290-
__artifact_full_name=$(get_artifact_with_suffix $artifact "")
12911301

12921302
local __suffix_arg=""
12931303
if [[ -n "$__docker_suffix" ]]; then
@@ -1305,6 +1315,7 @@ function verify(){
13051315

13061316
echo ""
13071317
fi
1318+
done
13081319
;;
13091320
mina-rosetta)
13101321
for network in "${__networks_arr[@]}"; do

‎scripts/debian/verify.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ if [ -z $REPO ]; then
6161
fi
6262

6363
case $PACKAGE in
64-
mina-archive) COMMAND="mina-archive --version && mina-archive --help" ;;
64+
mina-archive*) COMMAND="mina-archive --version && mina-archive --help" ;;
6565
mina-logproc) COMMAND="echo skipped execution for mina-logproc" ;;
6666
mina-rosetta*) COMMAND="echo skipped execution for mina-rosetta" ;;
6767
mina-*) COMMAND="mina --version && mina --help" ;;
6868
*) echo "❌ Unknown package passed: $PACKAGE"; exit 1;;
6969
esac
7070

71-
if [[ "$SIGNED" ]]; then
71+
if [[ "$SIGNED" == 1 ]]; then
7272
SIGNED=" (wget -q https://'$REPO'/repo-signing-key.asc -O- | apt-key add) && apt-get update > /dev/null && "
7373
else
7474
SIGNED=""

0 commit comments

Comments
 (0)