From 5dd2d23677808c8640dfcbaea09bf3dee45b18e5 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 15 Aug 2023 11:14:53 -0400 Subject: [PATCH] jjb: babeltrace-www: move to deb12 builders Change-Id: Ib40f6bc968d9830e4f12bccdf89d9253c5efbdb5 Signed-off-by: Michael Jeanson --- jobs/babeltrace-www.yaml | 23 ++++++------ scripts/babeltrace-www/deploy.sh | 62 ++++++++++++++++++++------------ 2 files changed, 52 insertions(+), 33 deletions(-) diff --git a/jobs/babeltrace-www.yaml b/jobs/babeltrace-www.yaml index 7ada8ce..37dc0f8 100644 --- a/jobs/babeltrace-www.yaml +++ b/jobs/babeltrace-www.yaml @@ -21,20 +21,31 @@ - file: credential-id: d023f830-9ab0-409f-b977-8cd0e1944dd5 variable: HOST_PUBLIC_KEYS + properties: - build-discarder: num-to-keep: 5 triggers: - timed: '@daily' + builders: - shell: !include-raw: scripts/babeltrace-www/deploy.sh scm: - - babeltrace-www + - git: + url: https://git.internal.efficios.com/efficios/bt2-www.git + basedir: ./ + skip-tag: true + branches: + - master publishers: + - archive: + artifacts: 'site/**,prod/**' + follow-symlinks: true + allow-empty: false - ircbot: strategy: statechange-only message-type: summary @@ -61,13 +72,3 @@ matrix-trigger: only-parent send-to: - recipients - -- scm: - name: babeltrace-www - scm: - - git: - url: https://git.internal.efficios.com/efficios/bt2-www.git - basedir: ./ - skip-tag: true - branches: - - master diff --git a/scripts/babeltrace-www/deploy.sh b/scripts/babeltrace-www/deploy.sh index a798159..2101057 100644 --- a/scripts/babeltrace-www/deploy.sh +++ b/scripts/babeltrace-www/deploy.sh @@ -2,6 +2,7 @@ # shellcheck disable=SC2103 # # Copyright (C) 2021 Jonathan Rajotte-Julien +# 2023 Michael Jeanson # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,61 +19,78 @@ set -exu -RUBY_VERSION=2.7 +print_header() { + set +x + + local message=" $1 " + local message_len + local padding_len + + message_len="${#message}" + padding_len=$(( (80 - (message_len)) / 2 )) + + printf '\n'; printf -- '#%.0s' {1..80}; printf '\n' + printf -- '-%.0s' {1..80}; printf '\n' + printf -- '#%.0s' $(seq 1 $padding_len); printf '%s' "$message"; printf -- '#%.0s' $(seq 1 $padding_len); printf '\n' + printf -- '-%.0s' {1..80}; printf '\n' + printf -- '#%.0s' {1..80}; printf '\n\n' + + set -x +} # Add ssh key for deployment cp "$HOST_PUBLIC_KEYS" ~/.ssh/known_hosts cp "$KEY_FILE_VARIABLE" ~/.ssh/id_rsa -# Nodejs -# Using Debian, as root -apt-add-repository ppa:brightbox/ruby-ng +export DEBIAN_FRONTEND=noninteractive apt-get update -apt-get install -y ruby${RUBY_VERSION} ruby${RUBY_VERSION}-dev ruby-switch ruby-bundler - -ruby-switch --list -ruby-switch --set ruby${RUBY_VERSION} -ruby -v -export PATH="/root/.gem/ruby/${RUBY_VERSION}.0/bin:$PATH" -bundle config set --local path "/root/.gem" +print_header "Install web tooling dependencies" +apt-get install -y jekyll npm grunt python3 python3-pip python3-venv linkchecker - -apt-get install -y jekyll npm grunt python3 python3-pip python3-venv - -# babeltrace dependencies +print_header "Install babeltrace build dependencies" apt-get install -y asciidoc xmlto libdw-dev libelf-dev elfutils autoconf automake libglib2.0-dev make doxygen flex bison +print_header "Install NPM stuff" npm install -python3 -m venv build_venv && source build_venv/bin/activate +print_header "Install Python requirements" +python3 -m venv build_venv +source build_venv/bin/activate pip install -r requirements.txt # Setting TERM avoids spurious warnings when configure is checking TPUT, as # $TERM is not set in the build environment. # As we've already opened a venv, set SKIP_VENV so the python job doesn't # create a second nested virtual environment. -TERM=dumb SKIP_VENV=1 grunt build:prod --verbose +print_header "Build website with grunt" +TERM=dumb SKIP_VENV=1 VERBOSE=1 grunt build:prod --verbose -apt-get install -y linkchecker +print_header "Check links" grunt connect:prod watch:prod & SERVER_PID="${!}" sleep 10 # While serve:prod starts up -OUTPUT_FILE="$(mktemp -d)/linkchecker-out.csv" -chown nobody "$(dirname "${OUTPUT_FILE}")" + +OUTPUT_DIR="$(mktemp -d)" +OUTPUT_FILE="${OUTPUT_DIR}/linkchecker-out.csv" + +# linkchecker drops privileges to 'nobody' when run as root +chown nobody "${OUTPUT_DIR}" + # @Note: Only internal links are checked by default if ! linkchecker -q -F "csv/utf-8/${OUTPUT_FILE}" http://localhost:10000/ ; then echo "Linkchecker failed or found broken links" cat "${OUTPUT_FILE}" kill "${SERVER_PID}" - rm -rf "${OUTPUT_FILE}/.." + rm -rf "${OUTPUT_DIR}" sleep 5 # Let serve:prod stop exit 1 else - rm -rf "${OUTPUT_FILE}/.." + rm -rf "${OUTPUT_DIR}" kill "${SERVER_PID}" fi +print_header "Deploy website" grunt deploy:prod --verbose # In the venv functions generated by the version of python installed on bionic -- 2.34.1