Commit 7f01881b authored by Robert Verkerk's avatar Robert Verkerk Committed by Michele Carpene
Browse files

Python3 tests added in CI/CD

parent 89aeb765
......@@ -45,48 +45,58 @@ after_script:
# ###################################
# build
# ###################################
build_4.2.6:
build_4.1.11:
stage: build
tags:
- irods
variables:
VERSION: centos7_4_2_6
VERSION: centos7_4_1_11
script:
- source .variables
- cat .variables
- ./ci/shutdownall.sh
- ./ci/build.sh --build 0 ${VERSION}
build_4.2.7:
build_4.1.12:
stage: build
tags:
- irods
variables:
VERSION: centos7_4_2_7
VERSION: centos7_4_1_12
script:
- source .variables
- ./ci/shutdownall.sh
- ./ci/build.sh --build 0 ${VERSION}
# #####################################
build_4.1.11:
build_4.2.6:
stage: build
tags:
- irods
variables:
VERSION: centos7_4_1_11
VERSION: centos7_4_2_6
script:
- source .variables
- cat .variables
- ./ci/shutdownall.sh
- ./ci/build.sh --build 0 ${VERSION}
build_4.1.12:
build_4.2.7:
stage: build
tags:
- irods
variables:
VERSION: centos7_4_1_12
VERSION: centos7_4_2_7
script:
- source .variables
- ./ci/shutdownall.sh
- ./ci/build.sh --build 0 ${VERSION}
build_4.2.8:
stage: build
tags:
- irods
variables:
VERSION: centos7_4_2_8
script:
- source .variables
- ./ci/shutdownall.sh
......@@ -95,6 +105,7 @@ build_4.1.12:
# #####################################
# Build container
# #####################################
container_4.1.11:
stage: build_container
tags:
......@@ -139,9 +150,32 @@ container_4.2.7:
- ./ci/shutdownall.sh
- ./ci/build_container.sh --build 0 ${VERSION}
container_4.2.8:
stage: build_container
tags:
- irods
variables:
VERSION: centos7_4_2_8
script:
- source .variables
- ./ci/shutdownall.sh
- ./ci/build_container.sh --build 0 ${VERSION}
# ###################################
# test
# ###################################
test_4.1.12:
stage: test
tags:
- irods
variables:
VERSION: centos7_4_1_12
script:
- source .variables
- ./ci/shutdownall.sh
- ./ci/test.sh ${VERSION}
test_4.2.6:
stage: test
tags:
......@@ -154,20 +188,34 @@ test_4.2.6:
- ./ci/shutdownall.sh
- ./ci/test.sh ${VERSION}
test_4.1.12:
test_4.2.7:
stage: test
tags:
- irods
variables:
VERSION: centos7_4_1_12
VERSION: centos7_4_2_7
script:
- source .variables
- cat .variables
- ./ci/shutdownall.sh
- ./ci/test.sh ${VERSION}
test_4.2.8:
stage: test
tags:
- irods
variables:
VERSION: centos7_4_2_8
script:
- source .variables
- cat .variables
- ./ci/shutdownall.sh
- ./ci/test.sh ${VERSION}
# ###################################
# deploy
# ###################################
deploy_4.1.11:
stage: deploy
tags:
......@@ -188,7 +236,6 @@ deploy_4.1.12:
- source .variables
- ./ci/deploy.sh ${VERSION}
# #####################################
deploy_4.2.6:
stage: deploy
tags:
......@@ -209,6 +256,14 @@ deploy_4.2.7:
- source .variables
- ./ci/deploy.sh ${VERSION}
deploy_4.2.8:
stage: deploy
tags:
- irods
variables:
VERSION: centos7_4_2_8
script:
- source .variables
- ./ci/deploy.sh ${VERSION}
......@@ -13,15 +13,15 @@ The script can be used *./ci/build.sh* to build the RPM package.
### Build the RPM
Build the B2SAFE package for CentOS 7 and iRODS 4.2.6.
Build the B2SAFE package for CentOS 7 and iRODS 4.2.8.
```
./ci/build.sh centos7_4_2_6
./ci/build.sh centos7_4_2_8
```
If the build process was successful, the RPM will be copied to the shared target folder:
```
ls ci/RPMS/Centos/7/irods-4.2.6/
ls ci/RPMS/Centos/7/irods-4.2.8/
irods-eudat-b2safe-4.3.0-0.noarch.rpm
```
......@@ -68,7 +68,7 @@ Configure the following files:
### Run the functional test
```
./ci/test.sh centos7_4_2_6
./ci/test.sh centos7_4_2_8
```
### Automation
......
......@@ -10,9 +10,12 @@ set -x
set -e
cp /secrets/308_21.T12995_TRAINING_certificate_only.pem /etc/irods/308_21.T12995_TRAINING_certificate_only.pem
cp /secrets/308_21.T12995_TRAINING_privkey.pem /etc/irods/308_21.T12995_TRAINING_privkey.pem
cp /secrets/install.json /opt/eudat/b2safe/packaging/install_overlay.json
cp /secrets/epic2_credentials /app/B2SAFE-core/scripts/tests/resources/epic2_credentials
cp /secrets/308_21.T12995_TRAINING_privkey.pem /etc/irods/308_21.T12995_TRAINING_privkey.pem
cp /secrets/TERENA-SSL-CA-3.pem /etc/pki/ca-trust/source/anchors/TERENA-SSL-CA-3.pem
/usr/bin/update-ca-trust
cp /secrets/install.json /opt/eudat/b2safe/packaging/install_overlay.json
cp /secrets/epic2_credentials /app/B2SAFE-core/scripts/tests/resources/epic2_credentials
/app/update_install.py /opt/eudat/b2safe/packaging/install.json /opt/eudat/b2safe/packaging/install_overlay.json
......@@ -20,6 +23,12 @@ cd /opt/eudat/b2safe/packaging/
sudo -u irods python install.py
# copy epicclient2.py credentials to make sure the correct epicclient2.py credentials are used
cd /opt/eudat/b2safe/conf
cp /secrets/epic2_credentials credentials
cd /opt/eudat/b2safe/packaging/
# end copy epicclient2.py credentials
echo "---------------------------------------"
echo "-- b2safe set up --"
echo "---------------------------------------"
......
......@@ -4,7 +4,7 @@ export REGISTRY=eudat-docker-public.artie.ia.surfsara.nl
export VOLUME=$( dirname $( pwd ) )
REGISTRY_USER=eudat-artie-readonly
_VERSION=centos7_4_2_6
_VERSION=centos7_4_2_8
CLEANUP="yes"
BUILD=0
GIT_BRANCH=""
......
......@@ -4,7 +4,7 @@ export REGISTRY=eudat-docker-public.artie.ia.surfsara.nl
# export VOLUME=$( dirname $( pwd ) )
# REGISTRY_USER=eudat-artie-readonly
_VERSION=centos7_4_2_6
_VERSION=centos7_4_2_8
CLEANUP="yes"
BUILD=0
GIT_BRANCH=""
......
FROM eudat-docker-public.artie.ia.surfsara.nl/light_centos7_4_2_8:latest
ADD RPM/b2safe.rpm /tmp/b2safe.rpm
RUN rpm -i /tmp/b2safe.rpm
ADD ci/centos7_4_2_8/eudat-artifactory.repo /etc/yum.repos.d/eudat-artifactory.repo
ADD ci/app/update_install.py /app/update_install.py
ADD ci/app/setup_b2safe.sh /app/setup_b2safe.sh
ADD ci/app/run_b2safe_tests.sh /app/run_b2safe_tests.sh
ADD ci/app/b2safe_entry_point.sh /app/b2safe_entry_point.sh
ADD . /app/B2SAFE-core
RUN pip3 install -r /app/B2SAFE-core/scripts/tests/requirements.txt && \
pip3 install b2handle
RUN yum clean all && \
yum install -y msi-persistent-id
ENTRYPOINT [ "/app/b2safe_entry_point.sh" ]
CMD [ "/app/sleep.sh" ]
[EUDAT]
name=EUDAT
baseurl=https://artie.ia.surfsara.nl/artifactory/Eudat-RPM-Testing-Public/Centos/7/irods-4.2.8/devel
enabled=1
gpgcheck=0
#!/bin/bash
_VERSION=centos7_4_2_6
_VERSION=centos7_4_2_8
CLEANUP="yes"
BUILD=0
GIT_BRANCH=""
......
......@@ -4,9 +4,9 @@ set -x
export REGISTRY=eudat-docker-public.artie.ia.surfsara.nl
for _V in centos7_4_2_6 centos7_4_1_12
for _V in centos7_4_2_8 centos7_4_2_7 centos7_4_2_6 centos7_4_1_12 centos7_4_1_11
do
export VERSION=$_V
echo "shuting down"
echo "shutting down $VERSION"
docker-compose -f ci/docker-compose.yml down -v
done
......@@ -3,7 +3,7 @@
export REGISTRY=eudat-docker-public.artie.ia.surfsara.nl
REGISTRY_USER=eudat-artie-readonly
_VERSION=centos7_4_2_6
_VERSION=centos7_4_2_8
CLEANUP="yes"
RUNTESTS="yes"
BUILD=0
......
......@@ -32,7 +32,7 @@ function rpm_package()
#
# example:
# -------
# irods_version centos7_4_2_6
# irods_version centos7_4_2_8
# > 4.2.6
#
# ###############################################################
......@@ -48,7 +48,7 @@ function irods_version()
# -----
# repo_name VERSION
#
# VERSION: {OS_VERSION}_{IRODS_VERSION}, e.g. centos7_4_2_6
# VERSION: {OS_VERSION}_{IRODS_VERSION}, e.g. centos7_4_2_8
#
# ###############################################################
function repo_name()
......
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