icecheng/freeleaps-ops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(executeFreeleapsPipeline): update build agent images to use docker.io and log environment variables in DependenciesResolver

Browse Source 
Signed-off-by: 孙振宇 <>
This commit is contained in:
孙振宇 2025-02-04 15:33:07 +08:00
parent 992daf0683
commit 794af6779b
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
first-class-pipeline/src/com/freeleaps/devops/DependenciesResolver.groovy
View File

@ -39,6 +39,7 @@ class DependenciesResolver {
if (mgr == null) { if (mgr == null) {
steps.error("Dependencies manager is not set") steps.error("Dependencies manager is not set")
} }
steps.sh "env"
steps.log.info("Dependencies Resolver","Ready to resolve dependencies for ${language}...") steps.log.info("Dependencies Resolver","Ready to resolve dependencies for ${language}...")

2
first-class-pipeline/tests/Jenkinsfile vendored
View File

@ -15,7 +15,6 @@ executeFreeleapsPipeline {
language: 'javascript', language: 'javascript',
dependenciesManager: 'npm', dependenciesManager: 'npm',
npmPackageJsonFile: 'package.json', npmPackageJsonFile: 'package.json',
buildAgentImage: 'node:lts',
buildCacheEnabled: true, buildCacheEnabled: true,
buildCommand: 'npm run build', buildCommand: 'npm run build',
lintEnabled: true, lintEnabled: true,
@ -38,7 +37,6 @@ executeFreeleapsPipeline {
root: 'backend', root: 'backend',
language: 'python', language: 'python',
dependenciesManager: 'pip', dependenciesManager: 'pip',
buildAgentImage: 'python:3.10-slim-buster',
buildCacheEnabled: true, buildCacheEnabled: true,
lintEnabled: true, lintEnabled: true,
linter: 'PyLint', linter: 'PyLint',

7
first-class-pipeline/vars/executeFreeleapsPipeline.groovy
View File

@ -19,10 +19,10 @@ def generateComponentStages(component, configurations) {
def language = ServiceLanguage.parse(configurations.serviceLang) def language = ServiceLanguage.parse(configurations.serviceLang)
switch(language) { switch(language) {
case ServiceLanguage.PYTHON: case ServiceLanguage.PYTHON:
buildAgentImage = "python:3.10-slim-buster" buildAgentImage = "docker.io/python:3.10-slim-buster"
break break
case ServiceLanguage.JS: case ServiceLanguage.JS:
buildAgentImage = "node:lts-alpine" buildAgentImage = "docker.io/node:lts-alpine"
break break
default: default:
error("Unknown service language") error("Unknown service language")
@ -65,9 +65,6 @@ def generateComponentStages(component, configurations) {
} else { } else {
dependenciesResolver.disableCachingSupport() dependenciesResolver.disableCachingSupport()
} }
def version = sh(script: "node -v", returnStdout: true).trim()
log.info 'Dependencies Resolver', "Node version is ${version}"
dependenciesResolver.resolve(component) dependenciesResolver.resolve(component)
} }