From bdee76c2b54287091b074b448c9f9bd90d9b51bd Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Fri, 1 Dec 2023 15:58:44 -0500 Subject: [PATCH] jjb: Add dev_review_efficios-www Change-Id: I3c73146fafa6a8a898daaeb67f5d5f4c821b1765 Signed-off-by: Kienan Stewart --- jobs/efficios-www.yaml | 84 ++++++++++++++++++++++++++++------ scripts/efficios-www/deploy.sh | 5 +- 2 files changed, 74 insertions(+), 15 deletions(-) diff --git a/jobs/efficios-www.yaml b/jobs/efficios-www.yaml index f4ab347..8664ebb 100644 --- a/jobs/efficios-www.yaml +++ b/jobs/efficios-www.yaml @@ -1,14 +1,29 @@ -- job: +- defaults: name: efficios-www project-type: freestyle - defaults: global node: amd64-rootnode + builders: + - shell: + !include-raw: scripts/efficios-www/deploy.sh + description: | This job is responsible for updating the efficios website.

Job is managed by Jenkins Job Builder.

+ properties: + - build-discarder: + num-to-keep: 5 + scm: + - git: + url: git@git.internal.efficios.com:efficios/efficios-www.git + credentials-id: f3c907b6-7485-49e1-afe1-4df24fac4ca1 + basedir: ./ + skip-tag: true + branches: + - master + wrappers: - ansicolor - timestamps @@ -21,27 +36,68 @@ - file: credential-id: d023f830-9ab0-409f-b977-8cd0e1944dd5 variable: HOST_PUBLIC_KEYS + - inject: + properties-content: | + DEPLOY_TARGET=deploy:prod + +- job: + name: dev_review_efficios-www + defaults: efficios-www properties: - build-discarder: - num-to-keep: 5 - - triggers: - - pollscm: - cron: "@hourly" - - builders: - - shell: - !include-raw: scripts/efficios-www/deploy.sh + days-to-keep: 1 + - throttle: + option: 'category' + categories: + - 'gerrit-build' scm: - git: - url: git@git.internal.efficios.com:efficios/efficios-www.git + url: ssh://jenkins@review.lttng.org:29418/efficios-www.git credentials-id: f3c907b6-7485-49e1-afe1-4df24fac4ca1 basedir: ./ - skip-tag: true branches: - - master + - '$GERRIT_REFSPEC' + refspec: 'refs/changes/*:refs/changes/*' + skip-tag: true + + triggers: + - gerrit: + trigger-on: + - comment-added-event: + approval-category: 'CI-Build' + approval-value: 1 + projects: + - project-compare-type: 'PLAIN' + project-pattern: 'efficios-www' + branches: + - branch-compare-type: 'PLAIN' + branch-pattern: 'master' + + wrappers: + - ansicolor + - timestamps + - credentials-binding: + - ssh-user-private-key: + credential-id: f3c907b6-7485-49e1-afe1-4df24fac4ca1 + key-file-variable: KEY_FILE_VARIABLE + username-variable: USER_NAME_VARIABLE + passphrase-variable: PASSPHRASE_VARIABLE + - file: + credential-id: d023f830-9ab0-409f-b977-8cd0e1944dd5 + variable: HOST_PUBLIC_KEYS + - inject: + properties-content: | + DEPLOY_TARGET=deploy:pre + +- job: + name: efficios-www + defaults: efficios-www + + triggers: + - pollscm: + cron: "@hourly" publishers: - archive: diff --git a/scripts/efficios-www/deploy.sh b/scripts/efficios-www/deploy.sh index 9f0fb13..389a317 100644 --- a/scripts/efficios-www/deploy.sh +++ b/scripts/efficios-www/deploy.sh @@ -37,6 +37,9 @@ print_header() { set -x } +# Fail early if not set +echo "Deploy target: ${DEPLOY_TARGET}" + # Add ssh key for deployment cp "$HOST_PUBLIC_KEYS" ~/.ssh/known_hosts cp "$KEY_FILE_VARIABLE" ~/.ssh/id_rsa @@ -84,5 +87,5 @@ else fi print_header "Deploy website" -grunt deploy:prod --verbose +grunt "${DEPLOY_TARGET}" --verbose # EOF -- 2.34.1