diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ca490dbef03c20695df9cfab9ac0c2e3d469abf..8a36a00a7161b936523b20e9de02ca204983c528 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,14 +10,6 @@ stages: - deploy -test-git: - stage: test - image: alpine:latest - script: - - apk update - - apk add git - - git branch -av - test-develop: stage: test image: openjdk:11-jre @@ -36,55 +28,55 @@ test-develop: reports: junit: target/report_output.xml -# test-prerelease: -# stage: test -# image: openjdk:11-jre -# script: -# - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar" -# - java -jar saref-pipeline.jar release -t && touch target/success -# allow_failure: true -# only: -# - /^prerelease-v/ -# artifacts: -# when: always -# paths: -# - target/site -# - target/success -# reports: -# junit: target/report_output.xml +test-prerelease: + stage: test + image: openjdk:11-jre + script: + - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar" + - java -jar saref-pipeline.jar release -t && touch target/success + allow_failure: true + only: + - /^prerelease-v/ + artifacts: + when: always + paths: + - target/site + - target/success + reports: + junit: target/report_output.xml -# deploy-report: -# stage: deploy -# image: alpine:latest -# script: -# - apk update -# - apk add openssh -# - eval $(ssh-agent -s) -# - ssh-add <(echo "$SAREF_DEV_KEY") -# - mkdir -p ~/.ssh -# - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' -# - scp -P 29419 -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID -# - echo "SAREF pipeline report https://saref.etsi.org/snapshot/$CI_PIPELINE_ID/report.html" -# - exit $(test -f target/success) $? -# except: -# - /^release-v/ +deploy-report: + stage: deploy + image: alpine:latest + script: + - apk update + - apk add openssh + - eval $(ssh-agent -s) + - ssh-add <(echo "$SAREF_DEV_KEY") + - mkdir -p ~/.ssh + - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + - scp -P 29419 -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID + - echo "SAREF pipeline report https://saref.etsi.org/snapshot/$CI_PIPELINE_ID/report.html" + - exit $(test -f target/success) $? + except: + - /^release-v/ -# test-release: -# stage: test -# image: openjdk:11-jre -# script: -# - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar" -# - java -jar saref-pipeline.jar release -t -# only: -# - /^release-v/ +test-release: + stage: test + image: openjdk:11-jre + script: + - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar" + - java -jar saref-pipeline.jar release -t + only: + - /^release-v/ -# trigger-release: -# stage: deploy -# only: -# - /^release-v/ -# variables: -# SAREF_DEV_KEY: $SAREF_DEV_KEY -# SAREF_PORTAL_KEY: $SAREF_PORTAL_KEY -# trigger: -# project: saref/saref-portal -# branch: master +trigger-release: + stage: deploy + only: + - /^release-v/ + variables: + SAREF_DEV_KEY: $SAREF_DEV_KEY + SAREF_PORTAL_KEY: $SAREF_PORTAL_KEY + trigger: + project: saref/saref-portal + branch: master