From f92a04cb21140a21f5649e1ce5b9fb3ddb97177f Mon Sep 17 00:00:00 2001
From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Tue, 11 Aug 2020 08:30:32 +0200
Subject: Run ci-management on control-slave

also install latest jjb version with pip.

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I5fd788ece16a410272434fcf25dd2545be4ba863
---
 jjb/ci-management/ci-management.yaml        | 8 ++++----
 jjb/ci-management/include-raw-jjb-update.sh | 8 ++++++++
 jjb/ci-management/include-raw-jjb-verify.sh | 9 +++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 jjb/ci-management/include-raw-jjb-verify.sh

(limited to 'jjb')

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 34b3dff4..916fd9bd 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -21,7 +21,7 @@
     name: ci-management-verify-jjb
 
     project-type: freestyle
-    node: master
+    node: control-slave
     concurrent: true
 
     parameters:
@@ -47,15 +47,15 @@
           files: '**/**'
 
     builders:
-      - shell: |
-          ls -alh ; jenkins-jobs test --recursive jjb/
+      - shell:
+          !include-raw-escape: include-raw-jjb-update.sh
       - ci-management-check-unicode
 
 - job-template:
     name: 'ci-management-merge'
 
     project-type: freestyle
-    node: master
+    node: control-slave
 
     build-discarder:
       days-to-keep: 30
diff --git a/jjb/ci-management/include-raw-jjb-update.sh b/jjb/ci-management/include-raw-jjb-update.sh
index 0a87bac6..7146995a 100644
--- a/jjb/ci-management/include-raw-jjb-update.sh
+++ b/jjb/ci-management/include-raw-jjb-update.sh
@@ -1,3 +1,11 @@
+#!/bin/bash
+
+curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
+python3 get-pip.py --user
+export PATH=/home/jenkins/.local/bin:$PATH
+
+pip3 install --user jenkins-job-builder
+
 jenkins-jobs update --delete-old --recursive jjb/
 
 # Submit patches for any jobs that can be auto updated
diff --git a/jjb/ci-management/include-raw-jjb-verify.sh b/jjb/ci-management/include-raw-jjb-verify.sh
new file mode 100644
index 00000000..d87a1093
--- /dev/null
+++ b/jjb/ci-management/include-raw-jjb-verify.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
+python3 get-pip.py --user
+export PATH=/home/jenkins/.local/bin:$PATH
+
+pip3 install --user jenkins-job-builder
+
+ls -alh
+jenkins-jobs test --recursive jjb/
-- 
cgit