From 0327459d1a269aad59780f34005a2c8d1bb3731b Mon Sep 17 00:00:00 2001
From: dzaitsev <dzaitsev@stormagic.com>
Date: Sat, 3 May 2025 14:18:19 +0300
Subject: [PATCH] updating and testing ImageMatcher pipeline

---
 build/jenkins/ImageMatcher | 41 +++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/build/jenkins/ImageMatcher b/build/jenkins/ImageMatcher
index 5f78eb7..2e35770 100644
--- a/build/jenkins/ImageMatcher
+++ b/build/jenkins/ImageMatcher
@@ -4,7 +4,7 @@ pipeline {
     agent {
         label 'Win10-BuildMachine' // Specify the agent label type and value directly
         // Removed: workspace 'C:/Jenkins/workspace/BuildDependencies'
-        // We will use a dir() step in the stages block instead.
+        // We will use a dir() step within the stage's steps block instead.
     }
 
     tools {
@@ -20,38 +20,33 @@ pipeline {
         CONFIGURATION = 'Release' // Example build configuration
 
         // Define the path to the shared workspace
-        SHARED_WORKSPACE = 'C:/Jenkins/workspace/BuildDependencies' // Define shared workspace path
+        SHARED_WORKSPACE = 'C:/Jenkins/workspace/Azaion' // Define shared workspace path
     }
 
     stages {
-        // Use a dir() step to ensure all subsequent stages/steps run in the shared workspace
-        dir(env.SHARED_WORKSPACE) {
-            echo "Changing directory to shared workspace: ${env.SHARED_WORKSPACE}"
-
-            // Removed: stage('Checkout ImageMatcher Code') - Code is checked out by Dependencies pipeline
-
-            stage('Build ImageMatcher') {
-                steps {
-                    echo 'Building ImageMatcher...'
-                    // Add steps here to build the ImageMatcher project
-                    // This might involve compiling code, running build scripts, etc.
-                    // Based on your original script, this likely involves running a build.cmd
+        stage('Build ImageMatcher') {
+            steps {
+                echo "Building ImageMatcher in shared workspace: ${env.SHARED_WORKSPACE}"
+                // Use a dir() step to ensure the build command runs in the shared workspace
+                dir(env.SHARED_WORKSPACE) {
                     // The code is expected to be in the 'gps-denied' subdirectory relative to the shared workspace
                     dir('gps-denied\\image-matcher') { // Change directory to the ImageMatcher build location relative to SHARED_WORKSPACE
                         bat 'build.cmd' // Replace with the actual build command
                     }
                 }
             }
+        }
 
-            // Optional: Archive ImageMatcher build artifacts if needed by Azaion Build
-            // stage('Archive ImageMatcher Artifacts') {
-            //    steps {
-            //        echo 'Archiving ImageMatcher artifacts...'
-            //        // Path is relative to the current directory (SHARED_WORKSPACE)
-            //        archiveArtifacts artifacts: 'path/to/imagematcher/build/output/**' // Adjust path
-            //    }
-            // }
-        } // end dir(env.SHARED_WORKSPACE)
+        // Optional: Archive ImageMatcher build artifacts if needed by Azaion Build
+        // stage('Archive ImageMatcher Artifacts') {
+        //    steps {
+        //        echo 'Archiving ImageMatcher artifacts...'
+        //        // Path is relative to the current directory (which will be SHARED_WORKSPACE due to the outer dir)
+        //        dir(env.SHARED_WORKSPACE) { // Ensure this also runs in the shared workspace
+        //            archiveArtifacts artifacts: 'path/to/imagematcher/build/output/**' // Adjust path relative to SHARED_WORKSPACE
+        //        }
+        //    }
+        // }
     }
 
     post {