Commit 5ad826a1 authored by Stefan Wolfsheimer's avatar Stefan Wolfsheimer
Browse files

Merge branch 'v3.2-beta5' into 'devel'

merge V3.2 beta5

See merge request b2safe/B2SAFE-core!4
parents 9f768067 aff5d2aa
......@@ -27,6 +27,22 @@ pipeline
}
}
stage('Build_4.1.11')
{
steps
{
echo '-------------'
echo 'Shutting down'
echo '-------------'
sh './ci/shutdownall.sh'
echo '-----------------------------'
echo 'Building against iRODS 4.1.11'
echo '-----------------------------'
sh './ci/build.sh centos7_4_1_11 --build ${BUILD_NUMBER} --url ${GIT_URL} --branch ${GIT_BRANCH}'
}
}
stage('Build_4.1.12')
{
steps
......@@ -63,7 +79,15 @@ pipeline
sh './ci/test.sh centos7_4_1_12 --build ${BUILD_NUMBER} --url ${GIT_URL} --branch ${GIT_BRANCH}'
}
}
stage('Deploy_4_1_11')
{
steps
{
echo '------------------------------'
echo 'Deploying.'
sh './ci/deploy.sh centos7_4_1_11 --build ${BUILD_NUMBER} --url ${GIT_URL} --branch ${GIT_BRANCH}'
}
}
stage('Deploy_4_1_12')
{
steps
......
version: '2'
volumes:
data-volume:
irods-vault:
irods-conf:
services:
postgres:
build:
context: ../postgres
dockerfile: Dockerfile
ports:
- "5432"
hostname: postgresc7426.irods
volumes:
- data-volume:/var/lib/postgresql/9.5/main
icat:
build:
context: ../..
dockerfile: ci/centos7_4_1_11/Dockerfile
ports:
- "127.0.0.1:1247:1247"
depends_on:
- postgres
links:
- "postgres:postgres"
hostname: centos7_41_11.irods
volumes:
- "../../:/build"
- irods-vault:/var/lib/irods
- irods-conf:/etc/irods
command: /app/setup_irods.sh
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment