From 8cf9ac3269ca906a921ba613ee5de2b36c516ba1 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 26 Jun 2020 17:07:48 +0200
Subject: Jenkins: ISO test is conditional on file existence

---
 Jenkinsfile | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c85f95ff..c2ec90a5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -151,22 +151,16 @@ pipeline {
                             --version 1.3-rolling-\$(date +%Y%m%d%H%M)
                         sudo make iso
                     """
+
+                    if (fileExists('build/live-image-amd64.hybrid.iso') == false) {
+                        error('ISO build error')
+                    }
                 }
             }
         }
         stage('Test ISO') {
             when {
-                beforeOptions true
-                beforeAgent true
-                anyOf {
-                    // Do not run ISO build when the Docker container definition or the build pipeline
-                    // library changes as this has no direct impact on the ISO image.
-                    not { changeset "**/docker/*" }
-                    not { changeset "**/vars/*" }
-                    not { changeset "**/packages/*" }
-                    triggeredBy 'TimerTrigger'
-                    triggeredBy cause: "UserIdCause"
-                }
+                expression { fileExists 'build/live-image-amd64.hybrid.iso' }
             }
             steps {
                 sh "sudo make test"
-- 
cgit v1.2.3