66 - build
77 - test
88 - deploy
9+ - deploy_tests
910
1011before_script :
1112 - pip install xmlrunner
@@ -69,12 +70,18 @@ build:
6970 stage : deploy
7071 image : $LINBIT_DOCKER_REGISTRY/build-helpers:latest
7172 rules :
72- - if : ' $CI_COMMIT_BRANCH == "jenkins"'
73+ - if : ' $CI_PIPELINE_SOURCE == "merge_request_event"'
74+ - if : $CI_COMMIT_BRANCH == 'master'
7375 before_script :
7476 - curl -sSL $LINBIT_REGISTRY_URL/repository/lbbuild/lbbuildctl-latest -o /usr/local/bin/lbbuildctl
7577 - chmod +x /usr/local/bin/lbbuildctl
7678 script :
77- - PYTHON_LINSTOR_VERSION=1.99.0
79+ - |
80+ case "$CI_COMMIT_REF_NAME" in
81+ "master") VERSION_SUFFIX="" ;;
82+ *) VERSION_SUFFIX=.dev$(echo -n $CI_COMMIT_REF_NAME | md5sum| sed -e 's/[^0-9]//g' | cut -c -9) ;;
83+ esac
84+ - PYTHON_LINSTOR_VERSION=1.99.0$VERSION_SUFFIX
7885 - awk -f "/usr/local/bin/dch.awk" -v PROJECT_VERSION="$PYTHON_LINSTOR_VERSION" -v PROJECT_NAME="python-linstor" debian/changelog > debian/changelog.tmp
7986 - mv debian/changelog{.tmp,}
8087 - sed -i "s/VERSION = \"[0-9\.]*/VERSION = \"$PYTHON_LINSTOR_VERSION/g" linstor/version.py
@@ -85,7 +92,10 @@ build:
8592 - lbbuildctl build python-linstor --arch amd64 --ci -v "$PYTHON_LINSTOR_VERSION" -l -e LINBIT_REGISTRY_USER=$LINBIT_REGISTRY_USER -e LINBIT_REGISTRY_PASSWORD=$LINBIT_REGISTRY_PASSWORD -e LINBIT_REGISTRY_URL=$LINBIT_REGISTRY_URL -d ubuntu-bionic,ubuntu-focal,rhel7.0,rhel8.0
8693
8794staging :
88- stage : deploy
95+ stage : deploy_tests
96+ variables :
97+ ARG_COMMIT_BRANCH : $CI_COMMIT_REF_NAME
8998 rules :
90- - if : ' $CI_COMMIT_BRANCH == "jenkins"'
99+ - if : ' $CI_PIPELINE_SOURCE == "merge_request_event"'
100+ - if : $CI_COMMIT_BRANCH == 'master'
91101 trigger : linstor/linstor-tests
0 commit comments