From 559d9fd4b10615c92ef100295f4fff5980c06e78 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Fri, 1 Dec 2023 15:39:38 -0500 Subject: [PATCH] jjb: Add dev_review_lttng-www Change-Id: I924fdbb835b7767f62aa25bc1eeea94e3b61746c Signed-off-by: Kienan Stewart --- jobs/lttng-www.yaml | 81 ++++++++++++++++++++++++++++++++----- scripts/lttng-www/deploy.sh | 5 ++- 2 files changed, 74 insertions(+), 12 deletions(-) diff --git a/jobs/lttng-www.yaml b/jobs/lttng-www.yaml index 4e18c59..be0c7bc 100644 --- a/jobs/lttng-www.yaml +++ b/jobs/lttng-www.yaml @@ -1,7 +1,6 @@ -- job: +- defaults: name: lttng-www project-type: freestyle - defaults: global node: amd64-rootnode description: | @@ -9,36 +8,96 @@

Job is managed by Jenkins Job Builder.

+ scm: + - git: + url: git@git.efficios.com:lttng-www.git + credentials-id: 63a5abb5-9056-47e2-b419-f5946c1b8f08 + basedir: ./ + branches: + - master + skip-tag: true + wrappers: - ansicolor - timestamps - credentials-binding: + - file: + credential-id: d023f830-9ab0-409f-b977-8cd0e1944dd5 + variable: HOST_PUBLIC_KEYS - ssh-user-private-key: credential-id: 63a5abb5-9056-47e2-b419-f5946c1b8f08 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:prod + properties: - build-discarder: num-to-keep: 5 - triggers: - - timed: '@daily' builders: - shell: !include-raw: scripts/lttng-www/deploy.sh +- job: + name: dev_review_lttng-www + defaults: lttng-www + scm: - git: - url: git@git.efficios.com:lttng-www.git - credentials-id: 63a5abb5-9056-47e2-b419-f5946c1b8f08 + url: ssh://jenkins@review.lttng.org:29418/lttng-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 + + properties: + - build-discarder: + days-to-keep: 1 + - throttle: + option: 'category' + categories: + - 'gerrit-build' + + triggers: + - gerrit: + trigger-on: + - comment-added-event: + approval-category: 'CI-Build' + approval-value: 1 + projects: + - project-compare-type: 'PLAIN' + project-pattern: 'lttng-www' + branches: + - branch-compare-type: 'PLAIN' + branch-pattern: 'master' + + wrappers: + - ansicolor + - timestamps + - credentials-binding: + - file: + credential-id: d023f830-9ab0-409f-b977-8cd0e1944dd5 + variable: HOST_PUBLIC_KEYS + - ssh-user-private-key: + credential-id: 63a5abb5-9056-47e2-b419-f5946c1b8f08 + key-file-variable: KEY_FILE_VARIABLE + username-variable: USER_NAME_VARIABLE + passphrase-variable: PASSPHRASE_VARIABLE + - inject: + properties-content: | + DEPLOY_TARGET=deploy:preprod + +- job: + name: lttng-www + defaults: lttng-www + + triggers: + - timed: '@daily' publishers: - archive: diff --git a/scripts/lttng-www/deploy.sh b/scripts/lttng-www/deploy.sh index 3d73a4d..2d3fe52 100755 --- a/scripts/lttng-www/deploy.sh +++ b/scripts/lttng-www/deploy.sh @@ -37,6 +37,9 @@ print_header() { set -x } +# Fail out early if this is 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 @@ -88,6 +91,6 @@ else fi print_header "Deploy website" -bundle exec grunt deploy:prod --network +bundle exec grunt "${DEPLOY_TARGET}" --network # EOF -- 2.34.1