[#32] Add package stage to Travis Build

.travis.yml

@@ -6,22 +6,18 @@ sudo: true
 language: java
 
 env:
-  matrix:
-    - SUBPROJECT=HIRS_Utils
-    - SUBPROJECT=HIRS_Provisioner
-    - SUBPROJECT=HIRS_ProvisionerTPM2
-    - SUBPROJECT=HIRS_Structs
-    - SUBPROJECT=HIRS_AttestationCA
-    - SUBPROJECT=HIRS_AttestationCAPortal
-    - SUBPROJECT=TPM_Utils
-    - SUBPROJECT=tpm_module
+  - SUBPROJECT=HIRS_Utils
+  - SUBPROJECT=HIRS_Provisioner
+  - SUBPROJECT=HIRS_ProvisionerTPM2
+  - SUBPROJECT=HIRS_Structs
+  - SUBPROJECT=HIRS_AttestationCA
+  - SUBPROJECT=HIRS_AttestationCAPortal
+  - SUBPROJECT=TPM_Utils
+  - SUBPROJECT=tpm_module
 
 services:
   - docker
 
-before_install:
-  - docker pull hirs/hirs-ci:centos7
-
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
@@ -34,3 +30,13 @@ install: true
 
 script:
   - docker run --rm hirs/hirs-ci:centos7 /bin/bash -c "git clone https://github.com/nsacyber/HIRS.git /root/HIRS; cd /root/HIRS; git checkout ${TRAVIS_BRANCH}; ./gradlew :$SUBPROJECT:build"
+
+jobs:
+  include:
+    - stage: package
+      script: docker run --rm hirs/hirs-ci:centos7 /bin/bash -c "git clone https://github.com/nsacyber/HIRS.git /root/HIRS; cd /root/HIRS; git checkout ${TRAVIS_BRANCH}; ./package/package.centos.sh"
+      env: null
+      name: "Package Centos"
+    - script: docker run --rm hirs/hirs-ci:ubuntu18 /bin/bash -c "git clone https://github.com/nsacyber/HIRS.git /root/HIRS; cd /root/HIRS; git checkout ${TRAVIS_BRANCH}; ./package/package.ubuntu.sh"
+      env: null
+      name: "Package Ubuntu"

docker/Dockerfile.centos7

@@ -4,7 +4,7 @@ MAINTAINER apl.dev3@jhuapl.edu
 
 # Install packages for building HIRS
 RUN yum -y update && yum clean all
-RUN yum install -y java-1.8.0-openjdk-devel epel-release cmake make git gcc-c++ doxygen graphviz python libssh2-devel openssl protobuf-compiler protobuf-devel tpm2-tss-devel trousers-devel
+RUN yum install -y java-1.8.0-openjdk-devel protobuf-compiler rpm-build epel-release cmake make git gcc-c++ doxygen graphviz python libssh2-devel openssl protobuf-devel tpm2-tss-devel trousers-devel
 RUN yum install -y cppcheck log4cplus-devel re2-devel
 
 # Set Environment Variables

docker/Dockerfile.ubuntu18

@@ -0,0 +1,10 @@
+FROM ubuntu:18.04
+
+MAINTAINER apl.dev3@jhuapl.edu
+
+# Install packages for building HIRS
+RUN apt-get update -y && apt-get upgrade -y && apt-get clean -y
+RUN apt-get -y install openjdk-8-jdk protobuf-compiler build-essential devscripts lintian debhelper cmake make git g++ doxygen graphviz cppcheck liblog4cplus-dev libssl-dev libprotobuf-dev libre2-dev libsapi-dev trousers libtspi-dev
+
+# Set Environment Variables
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64