diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-04-25 17:27:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-04-25 17:27:48 +0300 |
| commit | 45f55d340ceda73c6d6518b3edd7a4da18c67dd7 (patch) | |
| tree | 2f5a44bccd6845b2e005a92691e8eee2996e029f | |
| parent | 1330aa20156a91b2b4a3f71bfd58f2c9491c9900 (diff) | |
| download | evol-tools-45f55d340ceda73c6d6518b3edd7a4da18c67dd7.tar.gz evol-tools-45f55d340ceda73c6d6518b3edd7a4da18c67dd7.tar.bz2 evol-tools-45f55d340ceda73c6d6518b3edd7a4da18c67dd7.tar.xz evol-tools-45f55d340ceda73c6d6518b3edd7a4da18c67dd7.zip | |
gitlab-ci: move shared code into init.sh
| -rwxr-xr-x | gitlab-ci/clientdata/deploy.sh | 20 | ||||
| -rwxr-xr-x | gitlab-ci/clientdata/testxml.sh | 23 | ||||
| -rwxr-xr-x | gitlab-ci/init.sh | 22 |
3 files changed, 28 insertions, 37 deletions
diff --git a/gitlab-ci/clientdata/deploy.sh b/gitlab-ci/clientdata/deploy.sh index 4afc0cd..1ec39f8 100755 --- a/gitlab-ci/clientdata/deploy.sh +++ b/gitlab-ci/clientdata/deploy.sh @@ -1,23 +1,11 @@ #!/bin/bash -cd clientdata +source ./tools/gitlab-ci/init.sh + +clientdata_init + rm -rf public mkdir public -mkdir shared -echo >shared/error.log -echo ${CI_BUILD_ID} >shared/buildid.log - -function gitclone { - git clone $* - if [ "$?" != 0 ]; then - sleep 1s - git clone $* - if [ "$?" != 0 ]; then - sleep 3s - git clone $* - fi - fi -} cd .. ln -s clientdata client-data diff --git a/gitlab-ci/clientdata/testxml.sh b/gitlab-ci/clientdata/testxml.sh index 64915b4..9295ec3 100755 --- a/gitlab-ci/clientdata/testxml.sh +++ b/gitlab-ci/clientdata/testxml.sh @@ -1,33 +1,14 @@ #!/bin/bash -cd clientdata -rm -rf public -mkdir public -mkdir shared -echo >shared/error.log -echo ${CI_BUILD_ID} >shared/buildid.log +source ./tools/gitlab-ci/init.sh -function gitclone { - git clone $* - if [ "$?" != 0 ]; then - sleep 1s - git clone $* - if [ "$?" != 0 ]; then - sleep 3s - git clone $* - fi - fi -} - -cd .. -ln -s clientdata client-data +clientdata_init cd tools/testxml ./xsdcheck.sh export RES=$(cat errors.txt) if [[ -n "${RES}" ]]; then - echo "xml check failed" echo "xml check failed" >../../clientdata/shared/error.log echo ${RES} >>../../clientdata/shared/error.log cat ../../clientdata/shared/error.log diff --git a/gitlab-ci/init.sh b/gitlab-ci/init.sh new file mode 100755 index 0000000..f8831c3 --- /dev/null +++ b/gitlab-ci/init.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +function gitclone { + git clone $* + if [ "$?" != 0 ]; then + sleep 1s + git clone $* + if [ "$?" != 0 ]; then + sleep 3s + git clone $* + fi + fi +} + +function clientdata_init { + cd clientdata + mkdir shared + echo >shared/error.log + echo ${CI_BUILD_ID} >shared/buildid.log +} + +ln -s clientdata client-data |