feat(apps/prod/jenkins-gitee): add lock-resource plugin and add cre…

…d for github repos (#469) Signed-off-by: wuhuizuo <[email protected]>
PingCAP-QE · Apr 18, 2023 · 970ced9 · 970ced9
1 parent a94157d
commit 970ced9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/apps/prod/jenkins-gitee/release/values-JCasC.yaml b/apps/prod/jenkins-gitee/release/values-JCasC.yaml
@@ -6,7 +6,12 @@ controller:
   # 'name' and 'keyName' must be lowercase RFC 1123 label must consist of lower case alphanumeric characters or '-',
   # and must start and end with an alphanumeric character (e.g. 'my-name',  or '123-abc')
   additionalExistingSecrets:
-    # for git clone for private repo.
+    # for git clone for private repo in github.com
+    - { name: github, keyName: git-private-key }
+    - { name: github, keyName: git-username }
+    - { name: github, keyName: bot-token }
+
+    # for git clone for repos in gitee.com
     - { name: gitee, keyName: git-private-key }
     - { name: gitee, keyName: git-username }
     - { name: gitee, keyName: bot-token }
@@ -112,6 +117,23 @@ controller:
                       description: gitee private token to call api.
                       scope: GLOBAL
                       secret: ${gitee-bot-token}
+              - domain:
+                  name: github.com
+                  description: github ssh and open api
+                credentials:
+                  - basicSSHUserPrivateKey:
+                      id: github-bot-ssh
+                      privateKeySource:
+                        directEntry:
+                          privateKey: ${github-git-private-key}
+                      scope: GLOBAL
+                      username: ${github-git-username}
+                      usernameSecret: true
+                  - string:
+                      id: github-bot-token
+                      description: github private token to call api.
+                      scope: GLOBAL
+                      secret: ${github-bot-token}                   
       # for jobs.
       jobs-dsl: |
         jobs:

diff --git a/apps/prod/jenkins-gitee/release/values-controller-plugins.yaml b/apps/prod/jenkins-gitee/release/values-controller-plugins.yaml
@@ -85,11 +85,15 @@ controller:
     - artifactId: gitee
       source:
         # renovate: datasource=jenkins-plugins depName=gitee
-        version:  1.2.7
+        version: 1.2.7
     - artifactId: ssh-agent
       source:
         # renovate: datasource=jenkins-plugins depName=ssh-agent
-        version: 327.v230ecd01f86f 
+        version: 327.v230ecd01f86f
+    - artifactId: lockable-resources
+      source:
+        # renovate: datasource=jenkins-plugins depName=lockable-resources
+        version: 1141.v7c5f8f31d2ee
 
   # for plugin build-failure-analyzer
   #   Exporting to prometheus