[beam] branch master updated: Fix seed job (#22687)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

damccorm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new cf8e0605513 Fix seed job (#22687)
cf8e0605513 is described below

commit cf8e06055136792db264916585a478fbe418a555
Author: Danny McCormick <da...@google.com>
AuthorDate: Thu Aug 11 09:23:47 2022 -0700

    Fix seed job (#22687)
    
    * Dont merge: Test - figure out if seed job is picking up changes
    
    * Update main.py
    
    * Log all args
    
    * Try removing cert option
    
    * Delete cert.pem
    
    * Remove cert related things
---
 .../jenkins/committers_list_generator/cert.pem     | 35 ----------------------
 .../jenkins/committers_list_generator/main.py      | 20 ++++---------
 2 files changed, 5 insertions(+), 50 deletions(-)

diff --git a/.test-infra/jenkins/committers_list_generator/cert.pem b/.test-infra/jenkins/committers_list_generator/cert.pem
deleted file mode 100644
index 534d5675ef8..00000000000
--- a/.test-infra/jenkins/committers_list_generator/cert.pem
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGKTCCBBGgAwIBAgIUOu+0mevC4a1HWchpoKwZQajuDhcwDQYJKoZIhvcNAQEL
-BQAwgaMxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNQTEVMBMGA1UEBwwMRm9ycmVz
-dCBIaWxsMSIwIAYDVQQKDBlBcGFjaCBTb2Z0d2FyZSBGb3VuZGF0aW9uMRcwFQYD
-VQQLDA5JbmZyYXN0cnVjdHVyZTETMBEGA1UEAwwKYXBhY2hlLm9yZzEeMBwGCSqG
-SIb3DQEJARYPcm9vdEBhcGFjaGUub3JnMB4XDTIwMDExMDE2MzAyNVoXDTMwMDEw
-NzE2MzAyNVowgaMxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNQTEVMBMGA1UEBwwM
-Rm9ycmVzdCBIaWxsMSIwIAYDVQQKDBlBcGFjaCBTb2Z0d2FyZSBGb3VuZGF0aW9u
-MRcwFQYDVQQLDA5JbmZyYXN0cnVjdHVyZTETMBEGA1UEAwwKYXBhY2hlLm9yZzEe
-MBwGCSqGSIb3DQEJARYPcm9vdEBhcGFjaGUub3JnMIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEAvqU6WpRFJS5CHl97/jfx0oaCsi7U5AKiuIeTOFN27t3f
-GBAL71BrrZXtvtwcRKXgADlm0xLqhmWh2ICk2mvYLINEFl+BUrIu6oyDykWy3s7m
-4u6joTm5yXrQeItuezrXCvLqjR36eMwZ1CikRHpMudtNPF9LPicJNc+jq8nJWdmd
-68wwDDC9sHosQh3tz7gsGUFnHXDU2FotTA/tEWjdMrICONKCAtJn3J/wf0NdUEnl
-iYI8s7fOnZRrQmj4FXdThjRAHDZiWQqF3jqZiDaUEK61RjMLJkeELAj/Mt1mkI8w
-GtA38TKYcVy87wNRhNzltFY2MuOoyqT5iX0m8YRpmpZb+n+TWGQzgLZEkFVLBSZ6
-Nd1ty0bsofMmSZUqcSoTJEawCd1CG8iJx9e+V7Xy82LwgRC7ntwN5VstBoGNkA80
-u/78T+/KNpsREsv2holcCHlY3DW2lpHQf4F8OgwCvtL1adWil3uFDytTYTRyB1LL
-PDIfagI2wn/9uh1u66VKD/mrQdvJbX5p6q0BGtdQluIO6JG8rlxmlN19e4++kTWJ
-XEy0Nwk2sUtdvhq87vuZUW7RA5krdenkKsfnZQhRtsVZHAlf8PDbEiUU38yAcwJ/
-MIbqR24cvpOxDp8vHeCcSd2gI19AHvlhLMn9W3J2Z+kFiyZd2KUINHn9geijnycC
-AwEAAaNTMFEwHQYDVR0OBBYEFMV0+BUCWcWW61yek8COss/Enk/LMB8GA1UdIwQY
-MBaAFMV0+BUCWcWW61yek8COss/Enk/LMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggIBAByIqrQwZrPY8DQcki/WUxmCAErWyCRgnKqRp8TgA2PtskWL
-ILjFFCnmD7OXEWFadX69ionBYP8u1ypT90PiqmTAC43FtvjKL3x2ppP/ncAiQ4vy
-gPvWUIRgshJM+tAtg/gxcdqG3T6UZX8uBndp+jTO/eggFw65GRMbumxx82cE3oG6
-IRCH4FK1KPaByXZePPkGGZ1vXJhKDS+1TD3FfeuZ8vE64Fw7SdNCZtN7RBY0/fN/
-rnPRiBuWE5BIKIFU0rw4uosS8f9hdRDdfvOmXIQNVlOvQK0ls/MRm/yY9v272ZSY
-iqIuEzFCIYIP/GoJPcevuigwbyy/LVV2ztX9saqVRPRv7wlnHfT2mkCo1HmuGRgV
-vnKOBDiI5dVFlIlsbvdbpocjuDNl7Ldl0sZeeEgbN4pLhvKkH2WU/D1bbVJ/ZNmU
-WLNaeF9HStgxmFAPW06u0IKDOQG0JpGJjSaBJ2eAQhbsMf7iAt6LHsdvdpcFa8pe
-xDRm7CmznYRe2U3y7exD9n4+KvZ9Vhs9jo8sfGSwNOcFGbhZIvldhGPVI7bJfnDv
-kLH0scjdMV/QuW52lmFCfe5NKN2fzmNMt3J6eEmDyZIy+fSg82XtfDzGbS5bcJLw
-dhO6jfOm+Vwy5XohWVhSfAEvToge6O0bKnLzDRu4M5Lcdov9pOvEOTmkXZom
------END CERTIFICATE-----
diff --git a/.test-infra/jenkins/committers_list_generator/main.py b/.test-infra/jenkins/committers_list_generator/main.py
index a98d0885bdf..014c1eb5875 100644
--- a/.test-infra/jenkins/committers_list_generator/main.py
+++ b/.test-infra/jenkins/committers_list_generator/main.py
@@ -35,11 +35,10 @@ _FILENAME = "Committers.groovy"
 _PEOPLE_DN = "ou=people,dc=apache,dc=org"
 _BEAM_DN = "cn=beam,ou=project,ou=groups,dc=apache,dc=org"
 _GITHUB_USERNAME_ATTR = "githubUsername"
-_DEFAULT_LDAP_URIS = "ldaps://ldap-us-ro.apache.org:636 ldaps://ldap-eu-ro.apache.org:636"
-_DEFAULT_CERT_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "cert.pem")
+_DEFAULT_LDAP_URIS = "ldaps://ldap-us.apache.org:636 ldaps://ldap-eu.apache.org:636"
 
 
-def generate_groovy(output_dir, ldap_uris, cert_path):
+def generate_groovy(output_dir, ldap_uris):
     logging.info(f"Generating {_FILENAME}")
     env = jinja2.Environment(
         loader=jinja2.FileSystemLoader(
@@ -52,17 +51,15 @@ def generate_groovy(output_dir, ldap_uris, cert_path):
             template.render(
                 github_usernames=get_committers_github_usernames(
                     ldap_uris=ldap_uris,
-                    cert_path=cert_path,
                 ),
             )
         )
     logging.info(f"{_FILENAME} saved into {output_dir}")
 
 
-def get_committers_github_usernames(ldap_uris, cert_path):
+def get_committers_github_usernames(ldap_uris):
     connection = None
     try:
-        ldap.set_option(ldap.OPT_X_TLS_CACERTFILE, cert_path)
         ldap.set_option(ldap.OPT_X_TLS_DEMAND, True)
         ldap.set_option(ldap.OPT_REFERRALS, 0)
         connection = ldap.initialize(ldap_uris)
@@ -119,13 +116,6 @@ def _parse_args():
         default=os.getcwd(),
     )
 
-    parser.add_argument(
-        "-c", "--cert-path",
-        help="Path to the file containing SSL certificate of the LDAP server",
-        metavar="FILE",
-        default=_DEFAULT_CERT_PATH,
-    )
-
     parser.add_argument(
         "-u", "--ldap_uris",
         help="Whitespace separated list of LDAP servers URIs",
@@ -139,7 +129,7 @@ if __name__ == "__main__":
     try:
         logging.getLogger().setLevel(logging.INFO)
         args = _parse_args()
-        generate_groovy(args.output_dir, args.ldap_uris, args.cert_path)
+        generate_groovy(args.output_dir, args.ldap_uris)
     except CommittersGeneratorException as e:
-        logging.exception("Couldn't generate the list of committers")
+        logging.exception(f'Couldnt generate the list of committers with args: {args}')
         sys.exit(1)