diff options
Diffstat (limited to 'gitlab-ci/clientdata')
| -rwxr-xr-x | gitlab-ci/clientdata/deploy.sh | 20 | ||||
| -rwxr-xr-x | gitlab-ci/clientdata/testxml.sh | 23 |
2 files changed, 6 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 |