JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: switch back to pulling gateway@main

Browse Source 
Switch back to pulling gateway@main for continuous integration because
https://review.dev.storj.io/c/storj/gateway/+/5834 was merged. This
change is a partial revert of
https://review.dev.storj.io/c/storj/storj/+/5832.

Change-Id: I0a87f6f18a9a863fe92003b76c830335f9253ced
This commit is contained in:
Artur M. Wolff 2021-09-23 19:31:20 +02:00 committed by Stefan Benten
parent 9c232cebe1
commit cc9b845a83
5 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile.public
View File

@ -71,7 +71,7 @@ pipeline {
stage('go -race gateway') {
steps {
// install gateway for storj-sim
sh 'go install -race -v storj.io/gateway@5da0ff79b964560906bab67ce6f1eb16b89a93de'
sh 'go install -race -v storj.io/gateway@main'
}
}

4
Makefile
View File

@ -94,8 +94,8 @@ install-sim: ## install storj-sim
storj.io/storj/cmd/multinode
## install exact version of storj/gateway
## TODO replace 'main' with 'latest' when gateway with multipart will be released
go install -race -v storj.io/gateway@5da0ff79b964560906bab67ce6f1eb16b89a93de
## TODO(artur): replace 'main' with 'latest' after the gateway is being released again
go install -race -v storj.io/gateway@main
##@ Test

1
scripts/test-sim-backwards.sh
View File

@ -68,7 +68,6 @@ EOF
SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
sed -i -e 's#storj.io/gateway@main#storj.io/gateway@5da0ff79b964560906bab67ce6f1eb16b89a93de#g' "$RELEASE_DIR"/Makefile
GOBIN="$RELEASE_DIR"/bin make -C "$RELEASE_DIR" install-sim
GOBIN="$BRANCH_DIR"/bin make -C "$BRANCH_DIR" install-sim

8
scripts/tests/rollingupgrade/test-sim-rolling-upgrade.sh
View File

@ -114,12 +114,8 @@ install_sim(){
go build -race -v -o ${bin_dir}/gateway storj.io/storj/cmd/gateway >/dev/null 2>&1
popd
else
rm -rf .build/gateway-tmp
mkdir -p .build/gateway-tmp
pushd .build/gateway-tmp
## TODO replace 'main' with 'latest' when gateway with multipart will be released
go mod init gatewaybuild && GOBIN=${bin_dir} GO111MODULE=on go get storj.io/gateway@5da0ff79b964560906bab67ce6f1eb16b89a93de
popd
# TODO(artur): replace 'main' with 'latest' after the gateway is being released again
GOBIN=${bin_dir} go install -race storj.io/gateway@main
fi
if [ -d "${work_dir}/cmd/multinode" ]; then

6
scripts/tests/testversions/test-sim-versions.sh
View File

@ -91,10 +91,8 @@ install_sim(){
if [ -d "${work_dir}/cmd/gateway" ]; then
(cd ${work_dir}/cmd/gateway && go build -race -v -o ${bin_dir}/gateway storj.io/storj/cmd/gateway >/dev/null 2>&1)
else
mkdir -p ${work_dir}/build/gateway-tmp
## TODO replace 'main' with 'latest' when gateway with multipart will be released
(cd ${work_dir}/build/gateway-tmp && go mod init gatewaybuild && GOBIN=${bin_dir} GO111MODULE=on go get storj.io/gateway@5da0ff79b964560906bab67ce6f1eb16b89a93de;)
rm -rf ${work_dir}/build/gateway-tmp
# TODO(artur): replace 'main' with 'latest' after the gateway is being released again
GOBIN=${bin_dir} go install -race storj.io/gateway@main
fi
if [ -d "${work_dir}/cmd/multinode" ]; then
# as storj-sim is most likely installed from $PWD and contains storj-sim version which requires multinode