Unverified Commit 2cb7ed5d authored by michec81's avatar michec81 Committed by GitHub
Browse files

Merge pull request #138 from stefan-wolfsheimer/v3.2-beta5

V3.2 beta5
parents a08b04a7 e08f96bb
......@@ -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
......
FROM centos:7
RUN yum update -y && \
yum install -y \
rsync wget less emacs make cmake gcc gcc-c++
RUN rpm -ivh http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
rpm --import https://packages.irods.org/irods-signing-key.asc && \
wget -qO - https://packages.irods.org/renci-irods.yum.repo | \
tee /etc/yum.repos.d/renci-irods.yum.repo
RUN yum install -y \
sudo \
which \
python-jsonschema \
python-psutil \
python-pytest \
python-requests \
python-pip \
python-behave \
python-devel \
openssl-devel \
fuse-libs \
lsof \
openssl \
perl-JSON \
authd \
postgresql \
postgresql-odbc\
unixODBC \
boost-devel \
libcurl-devel \
supervisor \
rpm-build \
rpm-devel \
rpmlint \
rpmdevtools \
coreutils \
diffutils \
patch
# Openstack
RUN yum install -y centos-release-openstack-rocky
RUN yum install -y \
python-swiftclient \
python2-keystoneclient \
python-openstackclient
RUN pip install --upgrade pip && \
pip install flask \
flask_restful \
pytest \
s3cmd \
jsonschema \
python-irodsclient
COPY ci/app/odbcinst.ini /etc/odbcinst.ini
################################################################################
#
# irods
#
################################################################################
RUN yum install -y https://files.renci.org/pub/irods/releases/4.1.11/centos7/irods-icat-4.1.11-centos7-x86_64.rpm &&\
yum install -y https://files.renci.org/pub/irods/releases/4.1.11/centos7/irods-database-plugin-postgres-1.11-centos7-x86_64.rpm && \
yum install -y https://files.renci.org/pub/irods/releases/4.1.11/centos7/irods-runtime-4.1.11-centos7-x86_64.rpm && \
yum install -y https://files.renci.org/pub/irods/releases/4.1.11/centos7/irods-dev-4.1.11-centos7-x86_64.rpm && \
rpm -i --replacefiles https://files.renci.org/pub/irods/releases/4.1.11/centos7/irods-icommands-4.1.11-centos7-x86_64.rpm
################################################################################
#
# irods setup preparation
#
################################################################################
RUN useradd -rm -d /var/lib/irods irods
RUN mkdir -m 777 /src
ADD ci/app/4.1/setup_answers.txt /app/setup_answers.txt
ADD ci/app/4.1/setup_irods.sh /app/setup_irods.sh
ADD ci/app/4.1/surfsara-irods.repo /etc/yum.repos.d/surfsara-irods.repo
ADD ci/app/irods_environment.json /root/.irods/irods_environment.json
ADD ci/app/sleep.sh /app/sleep.sh
ADD ci/app/wait_for_pg.sh /app/wait_for_pg.sh
ADD ci/app/create_rpm.sh /app/create_rpm.sh
ADD ci/app/update_install.py /app/update_install.py
ADD scripts/tests/requirements.txt /app/test-requirements.txt
RUN cd /app && \
wget https://github.com/irods/irods/archive/4.1.11.tar.gz && \
tar -xvf 4.1.11.tar.gz
ADD scripts/tests/requirements.txt /app/test-requirements.txt
RUN pip install -r /app/test-requirements.txt
RUN yum install -y msi-persistent-id.x86_64
# install B2HANDLE
RUN pip install b2handle
CMD ["/app/setup_irods.sh"]
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