From 9cb697f5de7fca487f5bbc0ee442cf32e46cdad1 Mon Sep 17 00:00:00 2001
From: Sam Chesney <samc@xmos.com>
Date: Tue, 20 Aug 2019 13:03:45 +0100
Subject: [PATCH] Update Jenkins Pipeline to use new agents

---
 .gitignore  |  1 +
 Brewfile    |  7 +++++++
 Jenkinsfile | 59 ++++++++++++++++++++++++++++++++++++++++++-----------
 Pipfile     |  7 +++++++
 cpanfile    |  2 ++
 5 files changed, 64 insertions(+), 12 deletions(-)
 create mode 100644 Brewfile
 create mode 100644 Pipfile
 create mode 100644 cpanfile

diff --git a/.gitignore b/.gitignore
index e7e76877..d38743a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@
 .DS_Store
 test_results.csv
 _build*
+**/.venv/**
 
 # waf build files
 .lock-waf_*
diff --git a/Brewfile b/Brewfile
new file mode 100644
index 00000000..2fd6d0b8
--- /dev/null
+++ b/Brewfile
@@ -0,0 +1,7 @@
+tap 'homebrew/core'
+
+brew 'perl'
+brew 'cpanm'
+
+brew 'python@2'
+brew 'pipenv'
diff --git a/Jenkinsfile b/Jenkinsfile
index f2e9dbad..53498dbe 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,11 +1,52 @@
-@Library('xmos_jenkins_shared_library@master') _
+@Library('xmos_jenkins_shared_library@develop') _
+
+getApproval()
+
 pipeline {
   agent {
-    label 'x86&&macOS&&Apps'
+    label 'x86_64&&brew&&macOS'
   }
   environment {
-    VIEW = 'xua'
     REPO = 'lib_xua'
+    VIEW = "${env.JOB_NAME.contains('PR-') ? REPO+'_'+env.CHANGE_TARGET : REPO+'_'+env.BRANCH_NAME}"
+  }
+  triggers {
+    /* Trigger this Pipeline on changes to the repos dependencies
+     *
+     * If this Pipeline is running in a pull request, the triggers are set
+     * on the base branch the PR is set to merge in to.
+     *
+     * Otherwise the triggers are set on the branch of a matching name to the
+     * one this Pipeline is on.
+     */
+    upstream(
+      upstreamProjects:
+        (env.JOB_NAME.contains('PR-') ?
+          "../lib_device_control/${env.CHANGE_TARGET}," +
+          "../lib_dsp/${env.CHANGE_TARGET}," +
+          "../lib_i2c/${env.CHANGE_TARGET}," +
+          "../lib_logging/${env.CHANGE_TARGET}," +
+          "../lib_mic_array/${env.CHANGE_TARGET}," +
+          "../lib_spdif/${env.CHANGE_TARGET}," +
+          "../lib_xassert/${env.CHANGE_TARGET}," +
+          "../lib_xud/${env.CHANGE_TARGET}," +
+          "../tools_released/${env.CHANGE_TARGET}," +
+          "../tools_xmostest/${env.CHANGE_TARGET}," +
+          "../xdoc_released/${env.CHANGE_TARGET}"
+        :
+          "../lib_device_control/${env.BRANCH_NAME}," +
+          "../lib_dsp/${env.BRANCH_NAME}," +
+          "../lib_i2c/${env.BRANCH_NAME}," +
+          "../lib_logging/${env.BRANCH_NAME}," +
+          "../lib_mic_array/${env.BRANCH_NAME}," +
+          "../lib_spdif/${env.BRANCH_NAME}," +
+          "../lib_xassert/${env.BRANCH_NAME}," +
+          "../lib_xud/${env.BRANCH_NAME}," +
+          "../tools_released/${env.BRANCH_NAME}," +
+          "../tools_xmostest/${env.BRANCH_NAME}," +
+          "../xdoc_released/${env.BRANCH_NAME}"),
+      threshold: hudson.model.Result.SUCCESS
+    )
   }
   options {
     skipDefaultCheckout()
@@ -13,7 +54,7 @@ pipeline {
   stages {
     stage('Get view') {
       steps {
-        prepareAppsSandbox("${VIEW}", "${REPO}")
+        xcorePrepareSandbox("${VIEW}", "${REPO}")
       }
     }
     stage('Library checks') {
@@ -28,14 +69,8 @@ pipeline {
     }
     stage('Host builds') {
       steps {
-        dir("${REPO}") {
-          dir("${REPO}") {
-            dir('host') {
-              dir('xmosdfu') {
-                sh 'make -f Makefile.OSX64'
-              }
-            }
-          }
+        dir("${REPO}/${REPO}/host/xmosdfu") {
+          sh 'make -f Makefile.OSX64'
         }
       }
     }
diff --git a/Pipfile b/Pipfile
new file mode 100644
index 00000000..6d52bfd2
--- /dev/null
+++ b/Pipfile
@@ -0,0 +1,7 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+flake8 = "*"
diff --git a/cpanfile b/cpanfile
new file mode 100644
index 00000000..071f5e6a
--- /dev/null
+++ b/cpanfile
@@ -0,0 +1,2 @@
+requires 'File::Copy::Recursive';
+requires 'LWP::Simple'