From 425b7014fae6f11065362f890d0801d5974fa2de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E6=8C=AF=E5=AE=87?= <>
Date: Tue, 4 Feb 2025 15:49:33 +0800
Subject: [PATCH] refactor(executeFreeleapsPipeline): change agentContainer to
 use container function for dep-resolver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 孙振宇 <>
---
 .../vars/executeFreeleapsPipeline.groovy      | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index f270a4aa..ff41f468 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -37,7 +37,6 @@ def generateComponentStages(component, configurations) {
     stage("${component.name} :: Dependencies Resolving") {
       podTemplate(
         label: "dep-resolver-${component.name}",
-        agentContainer: 'dep-resolver',
         containers: [
           containerTemplate(
             name: 'dep-resolver',
@@ -49,25 +48,27 @@ def generateComponentStages(component, configurations) {
         ]
       ) {
         node("dep-resolver-${component.name}") {
-          script {
-            if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
-              log.info("Pipeline", "Using ${env.buildAgentImage} as build agent image for dependencies resolving")
-              def sourceFetcher = new SourceFetcher(this)
-              sourceFetcher.fetch(configurations)
+          container('dep-resolver') {
+            script {
+              if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
+                log.info("Pipeline", "Using ${env.buildAgentImage} as build agent image for dependencies resolving")
+                def sourceFetcher = new SourceFetcher(this)
+                sourceFetcher.fetch(configurations)
 
-              def language = ServiceLanguage.parse(component.language)
-              def depManager = DependenciesManager.parse(component.dependenciesManager)
+                def language = ServiceLanguage.parse(component.language)
+                def depManager = DependenciesManager.parse(component.dependenciesManager)
 
-              def dependenciesResolver = new DependenciesResolver(this, language, env.workspace + "/" + component.root + "/")
-              dependenciesResolver.useManager(depManager)
-              
-              if (component.buildCacheEnabled) {
-                  dependenciesResolver.enableCachingSupport()
-              } else {
-                  dependenciesResolver.disableCachingSupport()
+                def dependenciesResolver = new DependenciesResolver(this, language, env.workspace + "/" + component.root + "/")
+                dependenciesResolver.useManager(depManager)
+                
+                if (component.buildCacheEnabled) {
+                    dependenciesResolver.enableCachingSupport()
+                } else {
+                    dependenciesResolver.disableCachingSupport()
+                }
+
+                dependenciesResolver.resolve(component)
               }
-
-              dependenciesResolver.resolve(component)
             }
           }
         }