From 33314f5e48e01ea8fe3c23de194cbec4ba2b34f0 Mon Sep 17 00:00:00 2001 From: zhenyus Date: Fri, 18 Apr 2025 10:57:19 +0800 Subject: [PATCH] fix: update service Git repository URLs and credentials in Jenkinsfiles Signed-off-by: zhenyus --- .../prod/ci/freeleaps-service-hub/Jenkinsfile | 4 +-- .../prod/ci/freeleaps2-devsvc/Jenkinsfile | 4 +-- .../prod/ci/freeleaps2-frontend/Jenkinsfile | 10 +++---- log.example.jsonl | 28 +++++++++++++++++++ 4 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 log.example.jsonl diff --git a/freeleaps/prod/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/prod/ci/freeleaps-service-hub/Jenkinsfile index 708a5089..a4b090e7 100644 --- a/freeleaps/prod/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/prod/ci/freeleaps-service-hub/Jenkinsfile @@ -4,9 +4,9 @@ executeFreeleapsPipeline { serviceName = 'freeleaps' environmentSlug = 'prod' serviceGitBranch = 'master' - serviceGitRepo = "https://freeleaps@dev.azure.com/freeleaps/freeleaps-service-hub/_git/freeleaps-service-hub" + serviceGitRepo = "https://gitea.freeleaps.mathmast.com/freeleaps/freeleaps-service-hub.git" serviceGitRepoType = 'monorepo' - serviceGitCredentialsId = 'freeleaps-azure-devops-credentials' + serviceGitCredentialsId = 'freeleaps-repos-gitea-credentails' executeMode = 'on-demand' commitMessageLintEnabled = false components = [ diff --git a/freeleaps/prod/ci/freeleaps2-devsvc/Jenkinsfile b/freeleaps/prod/ci/freeleaps2-devsvc/Jenkinsfile index 80b8c08f..ccbd8f2d 100644 --- a/freeleaps/prod/ci/freeleaps2-devsvc/Jenkinsfile +++ b/freeleaps/prod/ci/freeleaps2-devsvc/Jenkinsfile @@ -4,9 +4,9 @@ executeFreeleapsPipeline { serviceName = 'freeleaps' environmentSlug = 'prod' serviceGitBranch = 'master' - serviceGitRepo = "https://freeleaps@dev.azure.com/freeleaps/freeleaps2-devsvc/_git/freeleaps2-devsvc" + serviceGitRepo = "https://gitea.freeleaps.mathmast.com/freeleaps/freeleaps2-devsvc.git" serviceGitRepoType = 'monorepo' - serviceGitCredentialsId = 'freeleaps-azure-devops-credentials' + serviceGitCredentialsId = 'freeleaps-repos-gitea-credentails' executeMode = 'on-demand' commitMessageLintEnabled = false components = [ diff --git a/freeleaps/prod/ci/freeleaps2-frontend/Jenkinsfile b/freeleaps/prod/ci/freeleaps2-frontend/Jenkinsfile index e4da68fb..a6378e7d 100644 --- a/freeleaps/prod/ci/freeleaps2-frontend/Jenkinsfile +++ b/freeleaps/prod/ci/freeleaps2-frontend/Jenkinsfile @@ -3,10 +3,10 @@ library 'first-class-pipeline' executeFreeleapsPipeline { serviceName = 'freeleaps' environmentSlug = 'prod' - serviceGitBranch = 'master' - serviceGitRepo = "https://freeleaps@dev.azure.com/freeleaps/freeleaps2-frontend/_git/freeleaps2-frontend" + serviceGitBranch = 'main' + serviceGitRepo = "https://gitea.freeleaps.mathmast.com/products/freeleaps.git" serviceGitRepoType = 'monorepo' - serviceGitCredentialsId = 'freeleaps-azure-devops-credentials' + serviceGitCredentialsId = 'freeleaps-repos-gitea-credentails' executeMode = 'on-demand' commitMessageLintEnabled = false components = [ @@ -60,8 +60,8 @@ executeFreeleapsPipeline { pnpmPackageJsonFile: 'package.json', buildCacheEnabled: true, buildAgentImage: 'node:lts', - buildCommand: 'pnpm -r build', - buildArtifacts: ['freeleaps/dist'], + buildCommand: 'NODE_OPTIONS=--max-old-space-size=4096 pnpm -r build', + buildArtifacts: ['freeleaps/dist', 'nuxt-front/.output/public'], lintEnabled: false, sastEnabled: false, imageRegistry: 'docker.io', diff --git a/log.example.jsonl b/log.example.jsonl new file mode 100644 index 00000000..d7529e9a --- /dev/null +++ b/log.example.jsonl @@ -0,0 +1,28 @@ +// Logging to File +{ + // logging by program + "level": "info", + "timestamp": 1744776892300, + "text": "This is a test log text", + "fields": { + "foo": "bar" + }, + "context": { + "app": "app-name", + "env": "alpha", + "log_line": 12, + "log_file": "auth.py" + }, + "stacktrace": null, + // enriched by the OpenTelemetry + "kubernetes": { + "pod": "pod-name", + "node": "node-name", + "pod_ip": "pod-ip", + "container_name": "container-name", + "node_ip": "node-ip", + "namespace": "namespace-name", + } +} + +// FmtLine: INFO - 2022-05-12 10:34:52 - - {"foo": "bar"} - This is a test log text \ No newline at end of file