summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorEric Ball <eball@linuxfoundation.org>2021-03-26 10:32:41 -0700
committerEric Ball <eball@linuxfoundation.org>2021-03-26 10:53:37 -0700
commitfd46fc522f14a5af3f4fe8ef4be6aac9c6ee427b (patch)
tree02148a5483aa7d79a87385184ede459e5e56bd6c /jjb
parentfc1c79c07417f9fdc10ad9a9ec0dc25f53991997 (diff)
Add script to update nodejs for Sonarcloud scans
Some projects have been seeing failures in Sonarcloud scans, as they are no longer compatible with Node <v10. We were unable to find the requirement that is pulling Node in, and it is not installed by default on the CI agents. By installing an up-to-date version before running any other tasks, the issue is fixed and the Sonarcloud scans do not run into any issues. All affected jobs have been updated. Change-Id: I01a578b37300b6dd6e6fd235218978a19518de99 Issue-ID: CIMAN-33 Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/externalapi/externalapi-nbi.yaml3
-rw-r--r--jjb/policy/policy-gui.yaml3
-rw-r--r--jjb/portal-sdk/portal-sdk.yaml3
-rw-r--r--jjb/portal/portal.yaml3
-rw-r--r--jjb/ubuntu-latest-nodejs.sh18
-rw-r--r--jjb/vid/vid.yaml3
6 files changed, 28 insertions, 5 deletions
diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index 7620cca0c..6bda3cba0 100644
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -67,7 +67,7 @@
- project:
name: externalapi-nbi-sonar
jobs:
- - gerrit-maven-sonar
+ - gerrit-maven-sonar-prescan-script
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
sonarcloud-api-token: '{sonarcloud_api_token}'
@@ -82,6 +82,7 @@
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
java-version: openjdk11
+ sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
- project:
name: externalapi-nbi-info
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 862c04031..43f096649 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -36,7 +36,7 @@
- project:
name: policy-gui-sonar
jobs:
- - gerrit-maven-sonar
+ - gerrit-maven-sonar-prescan-script
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
sonarcloud-api-token: '{sonarcloud_api_token}'
@@ -51,6 +51,7 @@
java-version: openjdk11
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
- project:
name: policy-gui-clm
diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index 0c54744ff..86b4e69c8 100644
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -34,7 +34,7 @@
- project:
name: portal-sdk-sonar
jobs:
- - gerrit-maven-sonar
+ - gerrit-maven-sonar-prescan-script
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
sonarcloud-api-token: '{sonarcloud_api_token}'
@@ -49,6 +49,7 @@
mvn-settings: 'portal-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
- project:
name: portal-sdk-clm
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index 2a6d6e5a0..ec3377276 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -31,7 +31,7 @@
- project:
name: portal-sonar
jobs:
- - gerrit-maven-sonar
+ - gerrit-maven-sonar-prescan-script
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
sonarcloud-api-token: '{sonarcloud_api_token}'
@@ -45,6 +45,7 @@
mvn-settings: 'portal-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
- project:
name: 'portal-coverity'
diff --git a/jjb/ubuntu-latest-nodejs.sh b/jjb/ubuntu-latest-nodejs.sh
new file mode 100644
index 000000000..04e3a10fb
--- /dev/null
+++ b/jjb/ubuntu-latest-nodejs.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2021 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+echo "---> ubuntu-latest-nodejs.sh"
+
+set -eufo pipefail
+
+sudo apt update
+sudo apt install -y nodejs npm
+sudo npm install -g n
+sudo n stable
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index ad118a866..748bb5e16 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -53,7 +53,7 @@
- project:
name: vid-sonar
jobs:
- - gerrit-maven-sonar
+ - gerrit-maven-sonar-prescan-script
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
sonarcloud-api-token: '{sonarcloud_api_token}'
@@ -67,6 +67,7 @@
mvn-settings: 'vid-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
- project:
name: vid-clm