Merge pull request #578 from chengshifan/gerrit-debug

[DM01-4872] adapt Infrabox Gerrit to the Gerrit with new backend GCP

Author: chengshifan

deploy/infrabox/templates/_helpers.tpl

@@ -280,6 +280,9 @@ https://{{- required "host is required" .Values.host -}}:{{- .Values.port -}}
 -
     name: INFRABOX_GERRIT_PORT
     value: {{ default "29418" .Values.gerrit.port | quote }}
+-
+    name: INFRABOX_GERRIT_CLONE_PORT
+    value: {{ default "39418" .Values.gerrit.clone_port | quote }}
 {{ end }}
 {{ end }}
 
@@ -561,4 +564,4 @@ https://{{- .Values.ha.global_host -}}:{{- .Values.ha.global_port -}}
     hostPath:
         path: {{ .Values.dev.repo_path }}
 {{ end }}
-{{ end }}
+{{ end }}

deploy/infrabox/values.yaml

@@ -204,6 +204,9 @@ gerrit:
     # Port
     port: 29418
 
+    # Clone Port
+    clone_port: 39418
+
 # Github configuration
 github:
     # Enable Github

src/gerrit/trigger/trigger.py

@@ -192,6 +192,7 @@ def handle_patchset_created_project(conn, event, project_id, project_name):
         "GERRIT_TOPIC": event['change'].get('topic', ""),
         "GERRIT_HOST": get_env('INFRABOX_GERRIT_HOSTNAME'),
         "GERRIT_PORT": get_env('INFRABOX_GERRIT_PORT'),
+        "GERRIT_CLONE_PORT": get_env('INFRABOX_GERRIT_CLONE_PORT'),
     }
 
     if event.get('uploader', None):
@@ -209,7 +210,7 @@ def handle_patchset_created_project(conn, event, project_id, project_name):
         "commit": sha,
         "clone_url": "ssh://%s@%s:%s/%s" % (get_env('INFRABOX_GERRIT_USERNAME'),
                                             get_env('INFRABOX_GERRIT_HOSTNAME'),
-                                            get_env('INFRABOX_GERRIT_PORT'),
+                                            get_env('INFRABOX_GERRIT_CLONE_PORT'),
                                             project_name),
         "ref": event['patchSet']['ref'],
         "event": event['change']['branch']