From ee96142f2d6045c38b3dc23461c7c136ea2b39c6 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 3 Mar 2025 12:39:45 +0100 Subject: [PATCH] ci: refs #8698 try lastSuccessfulBuild --- Jenkinsfile | 22 +++++++++++++++++++--- src/pages/Login/LoginMain.vue | 1 - 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ea680d93a..fb2fecb68 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -99,6 +99,7 @@ pipeline { script: "git rev-parse HEAD", returnStdout: true ).trim() + def files = [] while (lastSuccessfulBuild != null && lastSuccessfulBuild.result != 'SUCCESS') { lastSuccessfulBuild = lastSuccessfulBuild.previousBuild @@ -129,7 +130,19 @@ pipeline { modifiedFiles.each { file -> echo "- ${file}" + if(!file.startsWith('src/pages')){ + if(file.startsWith('test/cypress/integration')){ + files.add(file) + } + //else { + // files = 'test/cypress/integration/**/*.spec.js' + // return + // } + } + files = (files + searchFiles(file)).unique() } + + echo "files: " + files } } @@ -228,7 +241,7 @@ pipeline { } } - def searchFiles = { searchString -> +def searchFiles = { searchString -> def searchPath = "src/pages" // Buscar en todos los archivos .vue dentro de src/pages @@ -240,6 +253,9 @@ pipeline { // Filtrar por si la salida está vacía matchingFiles = matchingFiles.findAll { it.trim() } - echo "Archivos donde se encontró '${searchString}': ${matchingFiles}" - return matchingFiles + // Extraer solo el tercer segmento del path + def extractedFolders = matchingFiles.collect { "test/cypress/integration/" + it.split("/")[2] + "/**/*.spec.js" }.unique() + + echo "Carpetas donde se encontró '${searchString}': ${extractedFolders}" + return extractedFolders } diff --git a/src/pages/Login/LoginMain.vue b/src/pages/Login/LoginMain.vue index 76b84bab7..a4c3566a9 100644 --- a/src/pages/Login/LoginMain.vue +++ b/src/pages/Login/LoginMain.vue @@ -51,7 +51,6 @@ async function onSubmit() { }); } } -// REMOVE: