From daf44cb0c716c05b4bc6f92b8f5e7e58dde588db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= Date: Thu, 3 Jun 2021 11:17:15 +0200 Subject: [PATCH] Fix #13 Add a new job to deploy the packages in the alpha directory --- .gitlab-ci.yml | 21 +++++++++++++++------ flexisip-account-manager.spec | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e162701..3c39b85 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ job-centos7-rpm-test: when: always expire_in: 1 day -job-centos7-rpm-deploy: +.job-centos7-rpm-deploy: before_script: - if ! [ -z ${SCP_PRIVATE_KEY+x} ]; then eval $(ssh-agent -s); fi @@ -50,7 +50,6 @@ job-centos7-rpm-deploy: stage: deploy tags: [ "docker-centos7" ] - only: refs: - master @@ -62,7 +61,17 @@ job-centos7-rpm-deploy: script: - cd rpmbuild/x86_64 - - for deploydir in $CENTOS7_DEPLOY_DIRECTORY $CENTOS7_LEGACY_DEPLOY_DIRECTORY; do - rsync -e "ssh -o StrictHostKeyChecking=no" -pr . $DEPLOY_SERVER:$deploydir; - ssh $DEPLOY_SERVER "chmod a+r $deploydir/*.rpm && createrepo_c --update $deploydir/."; - done + - rsync -e "ssh -o StrictHostKeyChecking=no" -pr . $DEPLOY_SERVER:$CENTOS7_DEPLOY_DIRECTORY_STATE; + ssh $DEPLOY_SERVER "chmod a+r $CENTOS7_DEPLOY_DIRECTORY_STATE/*.rpm && createrepo_c --update $CENTOS7_DEPLOY_DIRECTORY_STATE/."; + +job-centos7-rpm-deploy-stable: + + extends: .job-centos7-rpm-deploy + variables: + CENTOS7_DEPLOY_DIRECTORY_STATE: $CENTOS7_DEPLOY_DIRECTORY_STABLE + +job-centos7-rpm-deploy-alpha: + + extends: .job-centos7-rpm-deploy + variables: + CENTOS7_DEPLOY_DIRECTORY_STATE: $CENTOS7_DEPLOY_DIRECTORY_ALPHA diff --git a/flexisip-account-manager.spec b/flexisip-account-manager.spec index 3fa38e2..ccb3415 100644 --- a/flexisip-account-manager.spec +++ b/flexisip-account-manager.spec @@ -8,7 +8,7 @@ #%define _datadir %{_datarootdir} #%define _docdir %{_datadir}/doc -%define build_number 77 +%define build_number 78 %define var_dir /var/opt/belledonne-communications %define opt_dir /opt/belledonne-communications/share/flexisip-account-manager