From 3b6ded166d659bde14b384ce4b3981d4378852ef Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kstewart@efficios.com>
Date: Tue, 27 Jun 2023 14:50:29 -0400
Subject: [PATCH] jjb: Build & deploy lttng-www using jammy rootnode

For compatibility reasons, the job was designed to run against the
bionic node. It recently started failing to build since the
sass-embedded version was pinned to 1.53, and various artifacts
related to building it could no longer be fetched from maven.org.

In the process of unpinning it, changes were done so that the project
can be built on jammy.

Change-Id: I9084939fc2222dc6d0b8229790d9968127975ec3
---
 jobs/lttng-www.yaml         |  2 +-
 scripts/lttng-www/deploy.sh | 26 ++++++++------------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/jobs/lttng-www.yaml b/jobs/lttng-www.yaml
index cebe758..15ea9a2 100644
--- a/jobs/lttng-www.yaml
+++ b/jobs/lttng-www.yaml
@@ -2,7 +2,7 @@
     name: lttng-www
     project-type: freestyle
     defaults: global
-    node: amd64-rootnode
+    node: amd64-rootnode-jammy
 
     description: |
       This job is responsible for updating the lttng website.
diff --git a/scripts/lttng-www/deploy.sh b/scripts/lttng-www/deploy.sh
index bb81757..f66c53f 100755
--- a/scripts/lttng-www/deploy.sh
+++ b/scripts/lttng-www/deploy.sh
@@ -18,39 +18,29 @@
 
 set -exu
 
-RUBY_VERSION=2.7
-
 # Add ssh key for deployment
 cp "$HOST_PUBLIC_KEYS" ~/.ssh/known_hosts
 cp "$KEY_FILE_VARIABLE" ~/.ssh/id_rsa
 
 # lttng-www dependencies
-
+export DPKG_FRONTEND=noninteractive
 # Nodejs
 # Using Debian, as root
-curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
-apt-get install -y nodejs
-
-apt-add-repository ppa:brightbox/ruby-ng
-apt-get install -y ruby${RUBY_VERSION} ruby${RUBY_VERSION}-dev ruby-switch ruby-bundler
-
-ruby-switch --list
-ruby-switch --set ruby${RUBY_VERSION}
-
+apt-get update
+apt-get install -y nodejs npm
+apt-get install -y ruby ruby-bundler ruby-dev
 ruby -v
 
-apt-get install -y asciidoc xmlto python3 python3-pip
+apt-get install -y asciidoc xmlto python3 python3-pip doclifter
 
 npm install -g grunt-cli
 npm install -g sass
 
-export PATH="/root/.gem/ruby/${RUBY_VERSION}.0/bin:$PATH"
-
-bundle config set --local path "/root/.gem"
+bundle config set --local path "vendor/bundle"
 
 ./bootstrap.sh
 
-grunt build:prod
-grunt deploy:prod
+bundle exec grunt build:prod --network
+bundle exec grunt deploy:prod --network
 
 # EOF
-- 
2.34.1