Commit 406f63f4 authored by Maiken's avatar Maiken

Somehow overwrite to previous non-working version. Now should be good again.

parent 73fae47f
......@@ -249,12 +249,11 @@ run_static_analysis_el6:
allow_failure: false
deploy_staging_deb9:
stage: deploy_and_test
image: docker:stable
script:
- ls -lhrt /arc-testfiles
- ls -lhrt /arc-logs
- name_container=deb9_`date +%Y%m%dT%H%M`
- docker pull maikenp/arc-deploy-debian9
- docker run --name=$name_container --privileged -v "/arc-testlogs:/arc-testlogs:rw" -v "/arc-logs:/arc-logs:rw" --publish 443 --publish 2811 --publish 9000-9002 --publish 9000-9002/udp --rm maikenp/arc-deploy-debian9
......@@ -283,17 +282,25 @@ deploy_staging_deb9:
- branches@nordugrid/arc
- tags@nordugrid/arc
allow_failure: true
deploy_staging_el6:
stage: deploy_and_test
image: docker:stable
script:
- ls -lhrt /arc-testfiles
- ls -lhrt /arc-logs
- name_container=el6_`date +%Y%m%dT%H%M`
- pwd
- echo $CI_PROJECT_DIR
- ls -lhrt
- ls -lhrt $CI_PROJECT_DIR/rpmbuild/*
- export DOCKER_API_VERSION=1.19
- deploy_container=el6_`date +%Y%m%dT%H%M`
- docker pull maikenp/arc-deploy-centos6
- docker run --name=$name_container --privileged -v "/arc-testlogs:/arc-testlogs:rw" -v "/arc-logs:/arc-logs:rw" --publish 443 --publish 2811 --publish 9000-9002 --publish 9000-9002/udp --rm maikenp/arc-deploy-centos6
- gitlab_container=$(docker ps | awk 'FNR==2' | awk '{print $NF}')
- cp -r $CI_PROJECT_DIR/rpmbuild/* /rpmbuild
- ls -lhrt /rpmbuild
- docker run --name=$deploy_container --volumes-from $gitlab_container -v "/rpmbuild:/rpmbuild:rw" -v "/arc-testlogs:/arc-testlogs:rw" -v "/arc-logs:/arc-logs:rw" --publish 443 --publish 2811 --publish 9000-9002 --publish 9000-9002/udp --rm maikenp/arc-deploy-centos6
- echo "*************>> Done - back from inner container"
- rm -rf /rpmbuild/*
- ls -lhrt /arc-logs
- cp -r /arc-logs $CI_PROJECT_DIR
- ls -lhrt $CI_PROJECT_DIR/arc-logs
......@@ -301,7 +308,7 @@ deploy_staging_el6:
- ls -lhrt /arc-logs
- rm -f /arc-testlogs/*
- ls -lhrt /arc-testlogs
- docker stop $name_container || true
- docker stop $deploy_container || true
environment:
name: staging
artifacts:
......@@ -323,11 +330,19 @@ deploy_staging_el7:
stage: deploy_and_test
image: docker:stable
script:
- pwd
- echo $CI_PROJECT_DIR
- ls -lhrt
- ls -lhrt $CI_PROJECT_DIR/rpmbuild/*
- export DOCKER_API_VERSION=1.19
- name_container=el7_`date +%Y%m%dT%H%M`
- deploy_container=el7_`date +%Y%m%dT%H%M`
- docker pull maikenp/arc-deploy-centos7
- docker run --name=$name_container --privileged -v "/arc-testlogs:/arc-testlogs:rw" -v "/arc-logs:/arc-logs:rw" --publish 443 --publish 2811 --publish 9000-9002 --publish 9000-9002/udp --rm maikenp/arc-deploy-centos7
- gitlab_container=$(docker ps | awk 'FNR==2' | awk '{print $NF}')
- cp -r $CI_PROJECT_DIR/rpmbuild/* /rpmbuild
- ls -lhrt /rpmbuild
- docker run --name=$deploy_container --volumes-from $gitlab_container --privileged -v "/rpmbuild:/rpmbuild:rw" -v "/arc-testlogs:/arc-testlogs:rw" -v "/arc-logs:/arc-logs:rw" --publish 443 --publish 2811 --publish 9000-9002 --publish 9000-9002/udp --rm maikenp/arc-deploy-centos7
- echo "*************>> Done - back from inner container"
- rm -rf /rpmbuild/*
- ls -lhrt /arc-logs
- cp -r /arc-logs $CI_PROJECT_DIR
- ls -lhrt $CI_PROJECT_DIR/arc-logs
......@@ -335,7 +350,7 @@ deploy_staging_el7:
- ls -lhrt /arc-logs
- rm -f /arc-testlogs/*
- ls -lhrt /arc-testlogs
- docker stop $name_container || true
- docker stop $deploy_container || true
environment:
name: staging
artifacts:
......@@ -346,7 +361,7 @@ deploy_staging_el7:
dependencies:
- packages_el7
tags:
- 158.39.75.5
- 158.39.75.5
only:
- branches@nordugrid/arc
- tags@nordugrid/arc
......
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