From dc9bbb07ebe2967839fdc22058282c4accbab206 Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 14:07:13 +0800 Subject: [PATCH 1/7] feat: update metrics branch name in Jenkinsfile --- freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile index 9a866d0e..aa06af29 100644 --- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile @@ -4,7 +4,7 @@ executeFreeleapsPipeline { serviceName = 'freeleaps' environmentSlug = 'alpha' // Ensure this branch exists in the freeleaps-service-hub repository - serviceGitBranch = 'freeleaps/icecheng/metrics' + serviceGitBranch = 'feature/icecheng/metrics' serviceGitRepo = "https://gitea.freeleaps.mathmast.com/freeleaps/freeleaps-service-hub.git" serviceGitRepoType = 'monorepo' serviceGitCredentialsId = 'freeleaps-ops-git-credentials' From 223f78c3a41746871cd000c7c9c2fc0f934c0213 Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 14:12:50 +0800 Subject: [PATCH 2/7] feat: update executeMode in Jenkinsfile --- freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile index aa06af29..5b2dff5e 100644 --- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile @@ -8,7 +8,7 @@ executeFreeleapsPipeline { serviceGitRepo = "https://gitea.freeleaps.mathmast.com/freeleaps/freeleaps-service-hub.git" serviceGitRepoType = 'monorepo' serviceGitCredentialsId = 'freeleaps-ops-git-credentials' - executeMode = 'on-demand' + executeMode = 'fully' commitMessageLintEnabled = false components = [ [ From 12a54572ae6cd9290116f2b85a75f464114169a9 Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 14:28:50 +0800 Subject: [PATCH 3/7] feat: update Jenkinsfile --- .../ci/freeleaps-service-hub/Jenkinsfile | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile index 5b2dff5e..043f8429 100644 --- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile @@ -8,9 +8,30 @@ executeFreeleapsPipeline { serviceGitRepo = "https://gitea.freeleaps.mathmast.com/freeleaps/freeleaps-service-hub.git" serviceGitRepoType = 'monorepo' serviceGitCredentialsId = 'freeleaps-ops-git-credentials' - executeMode = 'fully' + executeMode = 'on-demand' commitMessageLintEnabled = false components = [ + [ + name: 'metrics', + root: 'apps/metrcis', + language: 'python', + dependenciesManager: 'pip', + requirementsFile: 'requirements.txt', + buildCacheEnabled: true, + buildAgentImage: 'python:3.12-slim', + buildArtifacts: ['.'], + lintEnabled: false, + sastEnabled: false, + imageRegistry: 'docker.io', + imageRepository: 'freeleaps', + imageName: 'devops', + imageBuilder: 'dind', + dockerfilePath: 'Dockerfile', + imageBuildRoot: '.', + imageReleaseArchitectures: ['linux/amd64', 'linux/arm64/v8'], + registryCredentialsId: 'freeleaps-devops-docker-hub-credentials', + semanticReleaseEnabled: true + ], [ name: 'authentication', root: 'apps/authentication', @@ -136,27 +157,6 @@ executeFreeleapsPipeline { imageReleaseArchitectures: ['linux/amd64', 'linux/arm64/v8'], registryCredentialsId: 'freeleaps-devops-docker-hub-credentials', semanticReleaseEnabled: true - ], - [ - name: 'metrics', - root: 'apps/metrcis', - language: 'python', - dependenciesManager: 'pip', - requirementsFile: 'requirements.txt', - buildCacheEnabled: true, - buildAgentImage: 'python:3.12-slim', - buildArtifacts: ['.'], - lintEnabled: false, - sastEnabled: false, - imageRegistry: 'docker.io', - imageRepository: 'freeleaps', - imageName: 'devops', - imageBuilder: 'dind', - dockerfilePath: 'Dockerfile', - imageBuildRoot: '.', - imageReleaseArchitectures: ['linux/amd64', 'linux/arm64/v8'], - registryCredentialsId: 'freeleaps-devops-docker-hub-credentials', - semanticReleaseEnabled: true ] ] } \ No newline at end of file From c5e86e805633aa4bd84c789a8c0e68875f8d1db9 Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 14:31:19 +0800 Subject: [PATCH 4/7] feat: update executeMode in Jenkinsfile --- freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile index 043f8429..7661f333 100644 --- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile @@ -8,7 +8,7 @@ executeFreeleapsPipeline { serviceGitRepo = "https://gitea.freeleaps.mathmast.com/freeleaps/freeleaps-service-hub.git" serviceGitRepoType = 'monorepo' serviceGitCredentialsId = 'freeleaps-ops-git-credentials' - executeMode = 'on-demand' + executeMode = 'fully' commitMessageLintEnabled = false components = [ [ From 78b23aa18d9b19625074201d698d3f3879d9df92 Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 15:47:33 +0800 Subject: [PATCH 5/7] feat: update Jenkinsfile --- freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile index 7661f333..37d92b70 100644 --- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile @@ -13,7 +13,7 @@ executeFreeleapsPipeline { components = [ [ name: 'metrics', - root: 'apps/metrcis', + root: 'apps/metrics', language: 'python', dependenciesManager: 'pip', requirementsFile: 'requirements.txt', From 59b1f131405169464e9d346451b489f4d03608e7 Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 16:23:06 +0800 Subject: [PATCH 6/7] feat: update Jenkinsfile --- freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile index 37d92b70..da8401c7 100644 --- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile @@ -24,7 +24,7 @@ executeFreeleapsPipeline { sastEnabled: false, imageRegistry: 'docker.io', imageRepository: 'freeleaps', - imageName: 'devops', + imageName: 'metrics', imageBuilder: 'dind', dockerfilePath: 'Dockerfile', imageBuildRoot: '.', From 08881ceb32fa3d7ceb4da91b76784352b34241dd Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 17:23:08 +0800 Subject: [PATCH 7/7] feat: update Jenkinsfile --- freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile | 2 +- freeleaps/helm-pkg/metrics/values.alpha.yaml | 2 +- freeleaps/helm-pkg/metrics/values.prod.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile index da8401c7..716f0640 100644 --- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile @@ -4,7 +4,7 @@ executeFreeleapsPipeline { serviceName = 'freeleaps' environmentSlug = 'alpha' // Ensure this branch exists in the freeleaps-service-hub repository - serviceGitBranch = 'feature/icecheng/metrics' + serviceGitBranch = 'dev' serviceGitRepo = "https://gitea.freeleaps.mathmast.com/freeleaps/freeleaps-service-hub.git" serviceGitRepoType = 'monorepo' serviceGitCredentialsId = 'freeleaps-ops-git-credentials' diff --git a/freeleaps/helm-pkg/metrics/values.alpha.yaml b/freeleaps/helm-pkg/metrics/values.alpha.yaml index 7aff0edc..a74e2902 100644 --- a/freeleaps/helm-pkg/metrics/values.alpha.yaml +++ b/freeleaps/helm-pkg/metrics/values.alpha.yaml @@ -10,7 +10,7 @@ metrics: registry: docker.io repository: null name: metrics - tag: "1.0.0" + tag: snapshot-38ff0ae imagePullPolicy: IfNotPresent ports: - name: http diff --git a/freeleaps/helm-pkg/metrics/values.prod.yaml b/freeleaps/helm-pkg/metrics/values.prod.yaml index a516b0c0..9649d101 100644 --- a/freeleaps/helm-pkg/metrics/values.prod.yaml +++ b/freeleaps/helm-pkg/metrics/values.prod.yaml @@ -10,7 +10,7 @@ devops: registry: docker.io repository: null name: devops - tag: snapshot-046f9ff + tag: snapshot-38ff0ae imagePullPolicy: IfNotPresent ports: - name: http