Improve upgrade test runner

- Update certifi in regress pipenv
- Use normal test ports for upgrade tests
- Make diff behave correctly for upgrade tests

src/test/regress/Makefile

@@ -14,6 +14,7 @@ endif
 # We do this to be able to mask shard Ids, placement Ids, node ports, etc.
 MAKEFILE_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 export PATH := $(MAKEFILE_DIR)/bin:$(PATH)
+export PG_REGRESS_DIFF_OPTS = -dU10 -w
 
 ##
 ## Citus regression support

src/test/regress/Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "705f2b4bd5a49fcd8d7a7d0b4f1bc90f92f8fa3640764b36689296365d41aefe"
+            "sha256": "b275a748e05be7bb653f589f10e279838e2401900af6c211a00edb1212252a1c"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -67,10 +67,10 @@
         },
         "certifi": {
             "hashes": [
-                "sha256:046832c04d4e752f37383b628bc601a7ea7211496b4638f6514d0e5b9acc4939",
+                "sha256:e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50",
-                "sha256:945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695"
+                "sha256:fd7c7c74727ddcf00e9acd26bba8da604ffec95bf1c2144e67aff7a8b50e6cef"
             ],
-            "version": "==2019.6.16"
+            "version": "==2019.9.11"
         },
         "cffi": {
             "hashes": [

src/test/regress/upgrade/config.py

@@ -24,9 +24,9 @@ WORKER1 = 'worker1'
 WORKER2 = 'worker2'
 NODE_NAMES = [COORDINATOR_NAME, WORKER1, WORKER2]
 
-WORKER_PORTS = [9701, 9702]
+WORKER_PORTS = [57636, 57637]
 NODE_PORTS = {
-    COORDINATOR_NAME: 9700,
+    COORDINATOR_NAME: 57635,
-    WORKER1: 9701,
+    WORKER1: 57636,
-    WORKER2: 9702,
+    WORKER2: 57637,
 }