Skip to content

Commit d4d3c27

Browse files
committed
ci: fix deployment
1 parent 253ef42 commit d4d3c27

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

.gitlab-ci.yml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ variables:
99
DOCKER_IMAGE: registry.git.rwth-aachen.de/acs/public/villas/node
1010
DOCKER_IMAGE_DEV: registry.git.rwth-aachen.de/acs/public/villas/node/dev
1111
MAKE_OPTS: -j32
12-
RELEASEVER: 29
12+
RELEASEVER: '29'
1313

1414
stages:
1515
- prepare
@@ -221,28 +221,37 @@ packaging:rpm:
221221

222222
deploy:web:
223223
stage: deploy
224+
image:
225+
name: rclone/rclone:1.50
226+
entrypoint: [""]
227+
before_script:
228+
- rclone config create fein webdav url ${DEPLOY_PATH} vendor other user ${DEPLOY_USER} pass ${DEPLOY_PASS}
224229
script:
225-
- ssh ${DEPLOY_USER}@${DEPLOY_HOST} mkdir -p ${DEPLOY_PATH}/{coverage,doc}/${CI_BUILD_REF_NAME}/
226-
- rsync ${RSYNC_OPTS} build/doc/html/ ${DEPLOY_USER}@${DEPLOY_HOST}:${DEPLOY_PATH}/doc/$CI_BUILD_REF_NAME/
227-
- rsync ${RSYNC_OPTS} web/ ${DEPLOY_USER}@${DEPLOY_HOST}:${DEPLOY_PATH}/
230+
- rclone copy build/doc/html fein:villas/doc-dev/${CI_BUILD_REF_NAME}
228231
dependencies:
229232
- build:docs
230233
only:
231-
- tags
234+
# Only on version tags
235+
- "/^v\\d+(\\.\\d+)+$/"
232236
tags:
233-
- villas-deploy
237+
- docker
234238

235239
.deploy:packages: &deploy_packages
236240
stage: deploy
241+
image:
242+
name: rclone/rclone:1.50
243+
entrypoint: [""]
244+
before_script:
245+
- apk add curl
246+
- rclone config create fein webdav url ${DEPLOY_PATH} vendor other user ${DEPLOY_USER} pass ${DEPLOY_PASS}
237247
script:
238-
- ssh ${DEPLOY_USER}@${DEPLOY_HOST} mkdir -p $${DEPLOY_PATH_PACKAGES}/{fedora/x86_64,dist}
239-
- rsync ${RSYNC_OPTS} build/*.tar.gz ${DEPLOY_USER}@${DEPLOY_HOST}:${DEPLOY_PATH_PACKAGES}/dist/
240-
- rsync ${RSYNC_OPTS} build/*.rpm ${DEPLOY_USER}@${DEPLOY_HOST}:${DEPLOY_PATH_PACKAGES}/fedora/${RELEASEVER}/x86_64
241-
- ssh ${DEPLOY_USER}@${DEPLOY_HOST} createrepo ${DEPLOY_PATH_PACKAGES}/fedora/${RELEASEVER}/x86_64
248+
- rclone copy --max-depth 1 --include '*.tar.gz' build fein:packages/dist
249+
- rclone copy --max-depth 1 --include '*.rpm' build fein:packages/fedora/${RELEASEVER}/x86_64
250+
- curl -L --user ${DEPLOY_USER}:${DEPLOY_PASS} ${DEPLOY_PATH}/hooks/createrepo
242251
dependencies:
243252
- packaging:rpm
244253
tags:
245-
- villas-deploy
254+
- docker
246255

247256
deploy:packages:manual:
248257
<<: *deploy_packages
@@ -257,7 +266,7 @@ deploy:packages:tags:
257266
deploy:docker:
258267
stage: deploy
259268
before_script:
260-
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
269+
- docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
261270
script:
262271
- docker push ${DOCKER_IMAGE}:${DOCKER_TAG}
263272
- docker push registry.git.rwth-aachen.de/acs/public/villas/node/dev:${DOCKER_TAG}
@@ -269,3 +278,6 @@ deploy:docker:
269278
tags:
270279
- shell
271280
- linux
281+
only:
282+
# Only on version tags
283+
- "/^v\\d+(\\.\\d+)+$/"

0 commit comments

Comments
 (0)