Commit 73fae47f authored by Maiken's avatar Maiken

Now deploy step should be good for all 3 os-es, replaced systemd for el7 with...

Now deploy step should be good for all 3 os-es, replaced systemd for el7 with call to startup scripts and cleaned up the config.toml files on the actual gitlab runner hosts. In addition to doing some fixes in the entrypoint and Dockerfiles of the deploy images.
parent 98852c18
......@@ -248,16 +248,16 @@ run_static_analysis_el6:
- $CI_PROJECT_DIR/arc-tests/
allow_failure: false
deploy_staging_deb9:
stage: deploy_and_test
image: docker:stable
script:
- ls -lhrt /arc-testfiles
- ls -lhrt /arc-logs
- gitlab_container=$(docker ps | awk 'FNR==2' | awk '{print $NF}')
- deploy_container=deb9_`date +%Y%m%dT%H%M`
- name_container=deb9_`date +%Y%m%dT%H%M`
- docker pull maikenp/arc-deploy-debian9
- docker run --name=$deploy_container --volumes-from $gitlab_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
- 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
- echo "*************>> Done - back from inner container"
- ls -lhrt /arc-logs
- cp -r /arc-logs $CI_PROJECT_DIR
......@@ -266,7 +266,7 @@ deploy_staging_deb9:
- ls -lhrt /arc-logs
- rm -f /arc-testlogs/*
- ls -lhrt /arc-testlogs
- docker stop $deploy_container || true
- docker stop $name_container || true
environment:
name: staging
artifacts:
......@@ -277,23 +277,22 @@ deploy_staging_deb9:
dependencies:
- packages_deb9
tags:
- docker-socket-runner1
- 158.37.63.83
- deploy
only:
- 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
- gitlab_container=$(docker ps | awk 'FNR==2' | awk '{print $NF}')
- deploy_container=el6_`date +%Y%m%dT%H%M`
- name_container=el6_`date +%Y%m%dT%H%M`
- docker pull maikenp/arc-deploy-centos6
- 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-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
- echo "*************>> Done - back from inner container"
- ls -lhrt /arc-logs
- cp -r /arc-logs $CI_PROJECT_DIR
......@@ -302,7 +301,7 @@ deploy_staging_el6:
- ls -lhrt /arc-logs
- rm -f /arc-testlogs/*
- ls -lhrt /arc-testlogs
- docker stop $deploy_container || true
- docker stop $name_container || true
environment:
name: staging
artifacts:
......@@ -313,29 +312,22 @@ deploy_staging_el6:
dependencies:
- packages_el6
tags:
- docker-socket-runner-bgo4
- 158.39.74.3
only:
- branches@nordugrid/arc
- tags@nordugrid/arc
allow_failure: true
deploy_staging_centos7:
deploy_staging_el7:
stage: deploy_and_test
image: docker:stable
script:
- pwd
- ls -lhrt
- ls -lhrt $CI_PROJECT_DIR/rpmbuild/*
- export DOCKER_API_VERSION=1.19
- deploy_container=el7_`date +%Y%m%dT%H%M`
- name_container=el7_`date +%Y%m%dT%H%M`
- docker pull 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
- 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
- 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
......@@ -343,7 +335,7 @@ deploy_staging_centos7:
- ls -lhrt /arc-logs
- rm -f /arc-testlogs/*
- ls -lhrt /arc-testlogs
- docker stop $deploy_container || true
- docker stop $name_container || true
environment:
name: staging
artifacts:
......@@ -354,7 +346,7 @@ deploy_staging_centos7:
dependencies:
- packages_el7
tags:
- 158.39.75.5
- 158.39.75.5
only:
- branches@nordugrid/arc
- tags@nordugrid/arc
......@@ -363,4 +355,4 @@ deploy_staging_centos7:
## note-to-self: can also download the rpms from latest job with (example for el7):
## wget 'https://source.coderefinery.org/nordugrid/arc/-/jobs/artifacts/master/download?job=packages_el7' -O artifacts.zip
## wget 'https://source.coderefinery.org/nordugrid/arc/-/jobs/artifacts/master/download?job=packages_el7' -O artifacts.zip
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