use www2 as the deployment runner

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60179c773c3f3f43eb50b166cd972d022f694288..68a5c030e9fb640d5ab23b85894ea4284b958991 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,7 +62,6 @@ portable-source:
         - mkdir -p ${DIR}/source
         - mv *.deb ${DIR}/os/${ARCH}/
         - mv *.ddeb ${DIR}/debug/${ARCH}/
-        - cp graphviz-${GV_VERSION}.tar.gz ${DIR}/source/
     artifacts:
         when: on_success
         expire_in: 1 week
@@ -126,6 +125,8 @@ ubuntu19-04-build:
 deployment:
     stage: deploy
     script:
+        - GV_VERSION=$( cat VERSION )
+        - COLLECTION=$( cat COLLECTION )
         - eval $(ssh-agent -s)
         - cat "$DEPLOY_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
         - mkdir -p ~/.ssh
@@ -135,9 +136,13 @@ deployment:
         - chmod -R o-rwx Packages
         - chmod -R g-wx Packages
         - chmod -R g+X Packages
-        - for i in Packages/*; do ssh "$DEPLOY_USER"@"$DEPLOY_HOST" rm -rf $i; done
+        - ssh "$DEPLOY_USER"@"$DEPLOY_HOST" rm -rf Packages/"$COLLECTION"/{fedora,centos,ubuntu}
+        - ssh "$DEPLOY_USER"@"$DEPLOY_HOST" mkdir -p Packages/"$COLLECTION"/portable_source/
+        - scp graphviz-"$GV_VERSION".tar.gz "$DEPLOY_USER"@"$DEPLOY_HOST"':'Packages/"$COLLECTION"/portable_source/
         - scp -r Packages "$DEPLOY_USER"@"$DEPLOY_HOST"':'
-        - ssh "$DEPLOY_USER"@"$DEPLOY_HOST" 'for i in Packages/*/centos/*/source Packages/*/fedora/*/source; do createrepo $i; done'
-        - ssh "$DEPLOY_USER"@"$DEPLOY_HOST" 'for i in Packages/*/centos/*/os/* Packages/*/fedora/*/os/*; do createrepo $i; done'
-        - ssh "$DEPLOY_USER"@"$DEPLOY_HOST" 'for i in Packages/*/centos/*/debug/* Packages/*/fedora/*/debug/*; do createrepo $i; done'
+        - ssh "$DEPLOY_USER"@"$DEPLOY_HOST" 'for i in Packages/"$COLLECTION"/{fedora,centos}/*/{source,os/*,debug/*}; do createrepo $i; done'
         - scp graphviz-fedora.repo graphviz-centos.repo "$DEPLOY_USER"@"$DEPLOY_HOST"':'Packages/
+    only:
+        - master
+    tags:
+        - graphviz,deploy