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

build: replace 'multipart-upload' branch occurences

Browse Source 
We removed `multipart-upload` branches but we have few leftovers.

Change-Id: I74f637748a248cb286cd190a3a8f895ef85f3940
This commit is contained in:
Michał Niewrzał 2021-03-31 11:06:47 +02:00
parent 86c41790ce
commit a5bc38b197
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile.public
View File

@ -72,7 +72,7 @@ pipeline {
STORJ_TEST_COCKROACH_ALT = 'cockroach://root@localhost:26260/testcockroach?sslmode=disable'
STORJ_TEST_POSTGRES = 'postgres://postgres@localhost/teststorj?sslmode=disable'
STORJ_TEST_DATABASES = 'crdb|pgx|cockroach://root@localhost:26259/testmetabase?sslmode=disable;pg|pgx|postgres://postgres@localhost/testmetabase?sslmode=disable'
COVERFLAGS = "${ env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'multipart-upload' ? '-coverprofile=.build/coverprofile -coverpkg=storj.io/storj/private/...,storj.io/storj/pkg/...,storj.io/storj/satellite/...,storj.io/storj/storage/...,storj.io/storj/storagenode/...,storj.io/storj/versioncontrol/...' : ''}"
COVERFLAGS = "${ env.BRANCH_NAME == 'main' ? '-coverprofile=.build/coverprofile -coverpkg=storj.io/storj/private/...,storj.io/storj/pkg/...,storj.io/storj/satellite/...,storj.io/storj/storage/...,storj.io/storj/storagenode/...,storj.io/storj/versioncontrol/...' : ''}"
}
steps {
sh 'cockroach sql --insecure --host=localhost:26256 -e \'create database testcockroach;\''

5
Makefile
View File

@ -91,9 +91,8 @@ install-sim: ## install storj-sim
storj.io/storj/cmd/certificates
## install exact version of storj/gateway
mkdir -p ${GATEWAYPATH}
-cd ${GATEWAYPATH} && go mod init gatewaybuild
cd ${GATEWAYPATH} && GO111MODULE=on go get storj.io/gateway@multipart-upload
## TODO replace 'main' with 'latest' when gateway with multipart will be released
go install -race -v storj.io/gateway@main
##@ Test

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

@ -117,7 +117,8 @@ install_sim(){
rm -rf .build/gateway-tmp
mkdir -p .build/gateway-tmp
pushd .build/gateway-tmp
go mod init gatewaybuild && GOBIN=${bin_dir} GO111MODULE=on go get storj.io/gateway@multipart-upload
## 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@main
popd
fi
}

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

@ -92,7 +92,8 @@ install_sim(){
(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
(cd ${work_dir}/build/gateway-tmp && go mod init gatewaybuild && GOBIN=${bin_dir} GO111MODULE=on go get storj.io/gateway@multipart-upload;)
## 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@main;)
rm -rf ${work_dir}/build/gateway-tmp
fi
}