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

satellite/testing: Change testing to use PG 12.3 (#3913)

Browse Source 
Co-authored-by: Stefan Benten <mail@stefan-benten.de>
This commit is contained in:
Ethan Adams 2020-06-25 13:17:39 -04:00 committed by GitHub
parent 13a5854535
commit 66f5368807
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -21,7 +21,7 @@ node('node') {
echo "STORJ_SIM_POSTGRES: $STORJ_SIM_POSTGRES"
echo "STORJ_SIM_REDIS: $STORJ_SIM_REDIS"
sh 'docker run --rm -d -e POSTGRES_HOST_AUTH_METHOD=trust --name postgres-$BUILD_NUMBER postgres:9.6'
sh 'docker run --rm -d -e POSTGRES_HOST_AUTH_METHOD=trust --name postgres-$BUILD_NUMBER postgres:12.3'
sh 'docker run --rm -d --name redis-$BUILD_NUMBER redis:latest'
sh '''until $(docker logs postgres-$BUILD_NUMBER | grep "database system is ready to accept connections" > /dev/null)
@ -56,7 +56,7 @@ node('node') {
echo "STORJ_SIM_POSTGRES: $STORJ_SIM_POSTGRES"
echo "STORJ_SIM_REDIS: $STORJ_SIM_REDIS"
sh 'docker run --rm -d -e POSTGRES_HOST_AUTH_METHOD=trust --name postgres-$BUILD_NUMBER postgres:9.6'
sh 'docker run --rm -d -e POSTGRES_HOST_AUTH_METHOD=trust --name postgres-$BUILD_NUMBER postgres:12.3'
sh 'docker run --rm -d --name redis-$BUILD_NUMBER redis:latest'
sh '''until $(docker logs postgres-$BUILD_NUMBER | grep "database system is ready to accept connections" > /dev/null)

2
docker-compose.yaml
View File

@ -57,7 +57,7 @@ services:
redis:
image: redis
postgres:
image: postgres:9.6
image: postgres:12.3
environment:
- POSTGRES_PASSWORD=postgres
- POSTGRES_USER=postgres

2
scripts/postgres-dev.sh
View File

@ -8,7 +8,7 @@ cleanup(){
}
trap cleanup EXIT
docker run --rm -d -p 5433:5432 --name $CONTAINER_NAME -e POSTGRES_PASSWORD=tmppass postgres:9.6 -c log_min_duration_statement=0
docker run --rm -d -p 5433:5432 --name $CONTAINER_NAME -e POSTGRES_PASSWORD=tmppass postgres:12.3 -c log_min_duration_statement=0
docker logs -f $CONTAINER_NAME > $LOG_FILE 2>&1 &
STORJ_SIM_DATABASE=${STORJ_SIM_DATABASE:-"teststorj"}

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

@ -15,7 +15,7 @@ BUILD_NUMBER="dev"
export STORJ_SIM_POSTGRES="postgres://postgres@localhost:5433/teststorj?sslmode=disable"
export STORJ_SIM_REDIS="localhost:6380"
docker run --rm -d -p 5433:5432 -e POSTGRES_HOST_AUTH_METHOD=trust --name postgres-$BUILD_NUMBER postgres:9.6
docker run --rm -d -p 5433:5432 -e POSTGRES_HOST_AUTH_METHOD=trust --name postgres-$BUILD_NUMBER postgres:12.3
docker run --rm -d -p 6380:6379 --name redis-$BUILD_NUMBER redis:latest
until $(docker logs postgres-$BUILD_NUMBER | grep "database system is ready to accept connections" > /dev/null)

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

@ -15,7 +15,7 @@ BUILD_NUMBER="dev"
export STORJ_SIM_POSTGRES="postgres://postgres@localhost:5433/teststorj?sslmode=disable"
export STORJ_SIM_REDIS="localhost:6380"
docker run --rm -d -p 5433:5432 -e POSTGRES_HOST_AUTH_METHOD=trust --name postgres-$BUILD_NUMBER postgres:9.6
docker run --rm -d -p 5433:5432 -e POSTGRES_HOST_AUTH_METHOD=trust --name postgres-$BUILD_NUMBER postgres:12.3
docker run --rm -d -p 6380:6379 --name redis-$BUILD_NUMBER redis:latest
until $(docker logs postgres-$BUILD_NUMBER | grep "database system is ready to accept connections" > /dev/null)