Merge branch 'master' into release_2_5

gsmolk · gsmolk · commit 11e1240b7180 · 2021-06-17T22:56:32.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -26,21 +26,22 @@ notifications:
 
 # Default MODE is basic, i.e. all tests with PG_PROBACKUP_TEST_BASIC=ON
 env:
+    - PG_VERSION=12 PG_BRANCH=REL_13_STABLE
     - PG_VERSION=12 PG_BRANCH=REL_12_STABLE
-    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=archive
-    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=backup
-    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=compression
-    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=delta
-    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=locking
-    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=merge
-    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=page
-    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=replica
-    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=retention
-    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=restore
     - PG_VERSION=11 PG_BRANCH=REL_11_STABLE
     - PG_VERSION=10 PG_BRANCH=REL_10_STABLE
     - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
     - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
+#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=archive
+#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=backup
+#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=compression
+#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=delta
+#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=locking
+#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=merge
+#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=page
+#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=replica
+#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=retention
+#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=restore
 
 #jobs:
 #    allow_failures:
diff --git a/travis/run_tests.sh b/travis/run_tests.sh
@@ -8,9 +8,9 @@ set -xe
 sudo su -c 'mkdir /run/sshd'
 sudo su -c 'apt-get update -y'
 sudo su -c 'apt-get install openssh-client openssh-server -y'
-/etc/init.d/ssh start
+sudo su -c '/etc/init.d/ssh start'
 
-ssh-keygen -t rsa -q -N ""
+ssh-keygen -t rsa -f ~/.ssh/id_rsa -q -N ""
 cat ~/.ssh/id_rsa.pub > ~/.ssh/authorized_keys
 ssh-keyscan -H localhost >> ~/.ssh/known_hosts
 
