fix(jenkins/release/jenkins): try to sovle the shutdown problem

Signed-off-by: wuhuizuo <wuhuizuo@126.com>
PingCAP-QE · Aug 3, 2024 · 1a9cab9 · 1a9cab9
1 parent 26e71cb
commit 1a9cab9
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 47 deletions.
diff --git a/apps/prod/jenkins/release/values-JCasC.yaml b/apps/prod/jenkins/release/values-JCasC.yaml
@@ -280,49 +280,49 @@ controller:
                 env:
                   - key: "GOPROXY"
                     value: "http://goproxy.apps.svc,https://proxy.golang.org,direct"
-      build-failure-analyzer: |
-        unclassified:
-          buildFailureAnalyzer:
-            doNotAnalyzeAbortedJob: true
-            gerritTriggerEnabled: false
-            globalEnabled: true
-            graphsEnabled: false
-            knowledgeBase:
-              mongoDB:
-                dbName: jenkins-failure-pattern
-                enableStatistics: true
-                host: mongodb.apps.svc
-                password: "${mongodb-mongodb-root-password}"
-                port: 27017
-                successfulLogging: true
-                userName: root
-            maxLogSize: 0
-            metricSquashingEnabled: true
-            noCausesEnabled: true
-            noCausesMessage: >-
-              No problems were identified. If you know why this problem occurred,
-              please add a suitable Cause in https://pingcap.feishu.cn/wiki/wikcno79XYpVsvJeiRsMm38b5eh, add a config it.
-            nrOfScanThreads: 3
-            testResultParsingEnabled: false
-            testResultCategories: "UT"
-            fallbackCategoriesAsString: unknown
+      # build-failure-analyzer: |
+      #   unclassified:
+      #     buildFailureAnalyzer:
+      #       doNotAnalyzeAbortedJob: true
+      #       gerritTriggerEnabled: false
+      #       globalEnabled: true
+      #       graphsEnabled: false
+      #       knowledgeBase:
+      #         mongoDB:
+      #           dbName: jenkins-failure-pattern
+      #           enableStatistics: true
+      #           host: mongodb.apps.svc
+      #           password: "${mongodb-mongodb-root-password}"
+      #           port: 27017
+      #           successfulLogging: true
+      #           userName: root
+      #       maxLogSize: 0
+      #       metricSquashingEnabled: true
+      #       noCausesEnabled: true
+      #       noCausesMessage: >-
+      #         No problems were identified. If you know why this problem occurred,
+      #         please add a suitable Cause in https://pingcap.feishu.cn/wiki/wikcno79XYpVsvJeiRsMm38b5eh, add a config it.
+      #       nrOfScanThreads: 3
+      #       testResultParsingEnabled: false
+      #       testResultCategories: "UT"
+      #       fallbackCategoriesAsString: unknown
 
-      # for cloudevents plugin config.
-      # FIXME: should use cdevents plugin when the issue solved:
-      #   https://github.com/jenkinsci/cdevents-plugin/issues/9
-      cloudevents: |
-        unclassified:
-          cloudEventsGlobalConfig:
-            sinkType: "http"
-            sinkURL: "http://cloudevents-server.apps.svc/events"
-            completed: true
-            created: true
-            enteredWaiting: true
-            failed: true
-            finalized: true
-            left: true
-            started: true
-            updated: true
-            # nodes
-            offline: true
-            online: true
+      # # for cloudevents plugin config.
+      # # FIXME: should use cdevents plugin when the issue solved:
+      # #   https://github.com/jenkinsci/cdevents-plugin/issues/9
+      # cloudevents: |
+      #   unclassified:
+      #     cloudEventsGlobalConfig:
+      #       sinkType: "http"
+      #       sinkURL: "http://cloudevents-server.apps.svc/events"
+      #       completed: true
+      #       created: true
+      #       enteredWaiting: true
+      #       failed: true
+      #       finalized: true
+      #       left: true
+      #       started: true
+      #       updated: true
+      #       # nodes
+      #       offline: true
+      #       online: true
diff --git a/apps/prod/jenkins/release/values-controller.yaml b/apps/prod/jenkins/release/values-controller.yaml
@@ -3,7 +3,7 @@ controller:
   image:
     registry: "docker.io"
     repository: "jenkins/jenkins"
-    tag: "2.426.3-jdk17"
+    tag: "2.426.3-lts-jdk11"
   resources:
     requests:
       cpu: "16"
@@ -71,7 +71,7 @@ controller:
     # configures the hostname e.g. jenkins.example.com
     hostName: do.pingcap.net
   secondaryingress:
-    enabled: true
+    enabled: false
     apiVersion: networking.k8s.io/v1
     kubernetes.io/tls-acme: "true"
     ingressClassName: nginx