From fa7bbada6cd0f3e05d806cca1a88c5b3856ee20a Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 29 Mar 2017 04:07:58 +0200 Subject: [PATCH] updated GitLab CI for new build and packaging system --- .gitlab-ci.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64a7c661b..e35abd861 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,6 @@ variables: # This registry is a linked docker container running on the same host # and configured in gitlab-ci-runner config.toml as a linked service DOCKER_REGISTRY: acs-public:5000 - DOCKER_IMAGE: villas:latest PREFIX: /usr/ stages: @@ -15,15 +14,15 @@ stages: ############################################################################## # Build docker image which is used to build & test VILLASnode -docker-image: +docker-images: stage: prepare before_script: - git submodule sync --recursive - git submodule update --recursive --init - docker info script: - - docker build -t $DOCKER_REGISTRY/$DOCKER_IMAGE . - - docker push $DOCKER_REGISTRY/$DOCKER_IMAGE + - make docker-dev + - docker push $DOCKER_REGISTRY/docker-dev tags: - shell - linux @@ -117,10 +116,10 @@ packaging: deliver: stage: deploy script: - - rsync -r build/release/doc/html/ $DEPLOY_PATH/doc/$CI_BUILD_REF_NAME/ - - rsync -r build/release-coverage/coverage/ $DEPLOY_PATH/coverage/$CI_BUILD_REF_NAME/ - - rsync -r build/release/packaging/rpm/RPMS $DEPLOY_PATH/../packages - - createrepo $DEPLOY_PATH/../packages + - rsync -r build/release/doc/html/ $DEPLOY_HOST:$DEPLOY_PATH/doc/$CI_BUILD_REF_NAME/ + - rsync -r build/release-coverage/coverage/ $DEPLOY_HOST:$DEPLOY_PATH/coverage/$CI_BUILD_REF_NAME/ + - rsync -r build/release/packaging/rpm/RPMS $DEPLOY_HOST:$DEPLOY_PATH/../packages + - ssh $DEPLOY_HOST createrepo $DEPLOY_PATH/../packages dependencies: - docs - coverage