Changes to release scripts for 8.5 release

* Warning message in releaseWizard about setting GPG_TTY
* Download GPG keys from new location
* Correct git commands in release wizard

dev-tools/scripts/buildAndPushRelease.py

@@ -314,7 +314,7 @@ def check_key_in_keys(gpgKeyID, local_keys):
                        gpgKeyID[20:24], gpgKeyID[24:28], gpgKeyID[28:32], gpgKeyID[32:36], gpgKeyID[36:])
       re_to_match = r"^pub .*\n\s+(%s|%s)" % (gpgKeyID40Char, gpgKeyID)
     else:
-      print('Invalid gpg key id format. Must be 8 byte short ID or 40 byte fingerprint, with or without 0x prefix, no spaces.')
+      print('Invalid gpg key id format [%s]. Must be 8 byte short ID or 40 byte fingerprint, with or without 0x prefix, no spaces.' % gpgKeyID)
       exit(2)
     if re.search(re_to_match, keysFileText, re.MULTILINE):
       print('    Found key %s in KEYS file at %s' % (gpgKeyID, keysFileLocation))

dev-tools/scripts/releaseWizard.py

@@ -172,6 +172,8 @@ def check_prerequisites(todo=None):
         sys.exit("You will need gpg installed")
     if not check_ant().startswith('1.8'):
         print("WARNING: This script will work best with ant 1.8. The script buildAndPushRelease.py may have problems with PGP password input under ant 1.10")
+    if not 'GPG_TTY' in os.environ:
+        print("WARNING: GPG_TTY environment variable is not set, GPG signing may not work correctly (try 'export GPG_TTY=$(TTY)'")
     if not 'JAVA8_HOME' in os.environ or not 'JAVA11_HOME' in os.environ:
         sys.exit("Please set environment variables JAVA8_HOME and JAVA11_HOME")
     try:
@@ -1072,7 +1074,7 @@ def configure_pgp(gpg_todo):
     id = str(input("Please enter your Apache id: (ENTER=skip) "))
     if id.strip() == '':
         return False
-    all_keys = load('https://home.apache.org/keys/group/lucene.asc')
+    all_keys = load('https://downloads.apache.org/lucene/KEYS')
     lines = all_keys.splitlines()
     keyid_linenum = None
     for idx, line in enumerate(lines):
@@ -1083,7 +1085,7 @@ def configure_pgp(gpg_todo):
         keyid_line = lines[keyid_linenum]
         assert keyid_line.startswith('LDAP PGP key: ')
         gpg_id = keyid_line[14:].replace(" ", "")[-8:]
-        print("Found gpg key id %s on file at Apache (https://home.apache.org/keys/group/lucene.asc)" % gpg_id)
+        print("Found gpg key id %s on file at Apache (https://downloads.apache.org/lucene/KEYS)" % gpg_id)
     else:
         print(textwrap.dedent("""\
             Could not find your GPG key from Apache servers.

dev-tools/scripts/releaseWizard.yaml

@@ -432,7 +432,7 @@ groups:
         cmd: git checkout master
         tee: true
       - !Command
-        cmd: git update
+        cmd: git pull
         tee: true
       - !Command
         cmd: git ls-remote --exit-code --heads origin {{ stable_branch }}
@@ -461,7 +461,7 @@ groups:
         cmd: git checkout {{ stable_branch }}
         tee: true
       - !Command
-        cmd: git update
+        cmd: git pull
         tee: true
       - !Command
         cmd: git ls-remote --exit-code --heads origin {{ release_branch }}

dev-tools/scripts/smokeTestRelease.py

@@ -225,7 +225,9 @@ def checkAllJARs(topDir, project, gitRevision, version, tmpDir, baseURL):
     for file in files:
       if file.lower().endswith('.jar'):
         if project == 'solr':
-          if (normRoot.endswith('/contrib/dataimporthandler-extras/lib') and (file.startswith('javax.mail-') or file.startswith('activation-'))) or (normRoot.endswith('/test-framework/lib') and file.startswith('jersey-')):
+          if (normRoot.endswith('/contrib/dataimporthandler-extras/lib') and (file.startswith('javax.mail-') or file.startswith('activation-')))
+              or (normRoot.endswith('/test-framework/lib') and file.startswith('jersey-'))
+              or (normRoot.endsWith('/contrib/extraction/lib') and file.startswith('xml-apis-')):
             print('      **WARNING**: skipping check of %s/%s: it has javax.* classes' % (root, file))
             continue
         else: