From 2e926d633e15542866170a914492812f54c38fc0 Mon Sep 17 00:00:00 2001
From: apldev3 <apl.dev3@jhuapl.edu>
Date: Tue, 5 Feb 2019 12:07:47 -0500
Subject: [PATCH] [#87] Combine Packaging and System Tests into One Travis Test
 Phase (#89)

---
 .travis.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2afec0ac..51bc0ee4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,18 +36,15 @@ script:
 
 jobs:
   include:
-    - stage: package
-      script: docker run --rm -v $(pwd):/HIRS hirs/hirs-ci:centos7 /bin/bash -c "cd /HIRS; ./package/package.centos.sh"
-      env: null
-      name: "Package Centos"
-    - script: docker run --rm -v $(pwd):/HIRS hirs/hirs-ci:ubuntu18 /bin/bash -c "cd /HIRS; ./package/package.ubuntu.sh"
+    - stage: Packaging and System Tests
+      script: docker run --rm -v $(pwd):/HIRS hirs/hirs-ci:ubuntu18 /bin/bash -c "cd /HIRS; ./package/package.ubuntu.sh"
       env: null
       name: "Package Ubuntu"
-    - stage: system-tests
+    - stage: Packaging and System Tests
       script: .ci/system-tests/./run-system-tests.sh
       env: null
       name: "System Tests"
-    - stage: system-tests
+    - stage: Packaging and System Tests
       script: .ci/system-tests/./run-system-tests-tpm2.sh
       env: null
       name: "System Tests TPM2"