Merge pull request #3711 from austb/maint/7.x/new-branch-updates

Update 7.x travis tests

Author: jonathannewman

Diff for: .travis.yml

@@ -102,15 +102,15 @@ jobs:
       env: PDB_TEST=core+ext/openjdk8/pg-11
       script: *run-core-and-ext-tests
 
-    # === integration with main branches
+    # === integration with 7.x branches
     - stage: ❧ pdb tests
-      name: int pup-main srv-main jdk-11 pg-11
-      env: PDB_TEST=int/openjdk11/pup-main/srv-main/pg-11
+      name: int pup-main srv-7.x jdk-11 pg-11
+      env: PDB_TEST=int/openjdk11/pup-main/srv-7.x/pg-11
       script: *run-integration-tests
 
     - stage: ❧ pdb tests
-      name: int pup-main srv-main jdk-11 pg-11 rich
-      env: PDB_TEST=int/openjdk11/pup-main/srv-main/pg-11/rich
+      name: int pup-main srv-7.x jdk-11 pg-11 rich
+      env: PDB_TEST=int/openjdk11/pup-main/srv-7.x/pg-11/rich
       script: *run-integration-tests
 
     # === integration with Platform 6 branches

Diff for: README.md

@@ -1,4 +1,4 @@
-# PuppetDB [![Build Status](https://travis-ci.com/puppetlabs/puppetdb.svg?branch=master)](https://travis-ci.com/puppetlabs/puppetdb)
+# PuppetDB [![Build Status](https://app.travis-ci.com/puppetlabs/puppetdb.svg?branch=7.x)](https://app.travis-ci.com/puppetlabs/puppetdb)
 
 [docs]: https://docs.puppet.com/puppetdb/latest
 [contributing]: documentation/CONTRIBUTING.md