refactor(executeFreeleapsPipeline): remove EnvironmentVars class and streamline variable injection

Signed-off-by: 孙振宇 <>
This commit is contained in:
孙振宇 2025-01-22 16:10:48 +08:00
parent 2412360de2
commit a35a3ee8e1
3 changed files with 4 additions and 52 deletions

View File

@ -1,38 +0,0 @@
package com.freeleaps.devops
import com.freeleaps.devops.enums.ServiceLanguage
class EnvironmentVars {
def steps
EnvironmentVars(steps) {
this.steps = steps
}
def injectVars(configurations) {
if (configurations.serviceName == null || configurations.serviceName.isEmpty()) {
steps.error("serviceName is required")
}
steps.env.serviceName = configurations.serviceName
steps.env.serviceLang = ServiceLanguage.parse(configurations.serviceLang)
if (steps.env.serviceLang == ServiceLanguage.UNKNOWN) {
steps.error("Unknown service language: ${configurations.serviceLang}")
}
if (configurations.serviceGitRepo == null || configurations.serviceGitRepo.isEmpty()) {
steps.error("serviceGitRepo is required")
}
steps.env.serviceGitRepo = configurations.serviceGitRepo
if (configurations.serviceGitBranch == null || configurations.serviceGitBranch.isEmpty()) {
steps.error("serviceGitBranch is required")
}
steps.env.serviceGitBranch = configurations.serviceGitBranch
if (configurations.environmentSlug == null || configurations.environmentSlug.isEmpty()) {
steps.error("environmentSlug is required")
}
steps.env.environmentSlug = configurations.environmentSlug
}
}

View File

@ -6,4 +6,5 @@ executeFreeleapsPipeline {
environmentSlug = 'alpha' environmentSlug = 'alpha'
dependenciesManager = 'PIP' dependenciesManager = 'PIP'
pipRequirementsFile = 'requirements.txt' pipRequirementsFile = 'requirements.txt'
buildCacheEnabled = true
} }

View File

@ -1,6 +1,5 @@
#!groovy #!groovy
import com.freeleaps.devops.EnvironmentVars
import com.freeleaps.devops.SourceFetcher import com.freeleaps.devops.SourceFetcher
import com.freeleaps.devops.DependenciesResolver import com.freeleaps.devops.DependenciesResolver
import com.freeleaps.devops.enums.DependenciesManager import com.freeleaps.devops.enums.DependenciesManager
@ -12,8 +11,6 @@ def call(body) {
body.delegate = configurations body.delegate = configurations
body() body()
def environmentVars = new EnvironmentVars(this)
pipeline { pipeline {
agent any agent any
options { options {
@ -32,14 +29,6 @@ def call(body) {
} }
} }
stage("Prepared Environment Variables") {
steps {
script {
environmentVars.injectVars(configurations)
}
}
}
stage("Commit Linting If Enabled") { stage("Commit Linting If Enabled") {
steps { steps {
script { script {
@ -59,7 +48,7 @@ def call(body) {
if (buildAgentImage == null || buildAgentImage.isEmpty()) { if (buildAgentImage == null || buildAgentImage.isEmpty()) {
echo "Not set buildAgentImage, using default build agent image" echo "Not set buildAgentImage, using default build agent image"
def language = env.serviceLang def language = ServiceLanguage.parse(configurations.serviceLang)
switch(language) { switch(language) {
case ServiceLanguage.PYTHON: case ServiceLanguage.PYTHON:
buildAgentImage = "python:3.10-slim-buster" buildAgentImage = "python:3.10-slim-buster"
@ -106,7 +95,7 @@ spec:
} }
steps { steps {
script { script {
def language = env.serviceLang def language = ServiceLanguage.parse(configurations.serviceLang)
def depManager = DependenciesManager.parse(configurations.dependenciesManager) def depManager = DependenciesManager.parse(configurations.dependenciesManager)
if (depManager == DependenciesManager.UNKNOWN) { if (depManager == DependenciesManager.UNKNOWN) {
@ -116,7 +105,7 @@ spec:
def dependenciesResolver = new DependenciesResolver(this, language) def dependenciesResolver = new DependenciesResolver(this, language)
dependenciesResolver.useManager(depManager) dependenciesResolver.useManager(depManager)
if (configurations.BUILD_CACHE_ENABLED == "true") { if (configurations.buildCacheEnabled) {
dependenciesResolver.enableCachingSupport() dependenciesResolver.enableCachingSupport()
} else { } else {
dependenciesResolver.disableCachingSupport() dependenciesResolver.disableCachingSupport()