From 3cdd3b4dff73c59002143d64388d1078fb753411 Mon Sep 17 00:00:00 2001
From: Christian Rebischke <chris@nullday.de>
Date: Mon, 30 Sep 2019 22:00:42 +0200
Subject: [PATCH] modified travis.yml that it makes use of generic

Signed-off-by: Christian Rebischke <chris@nullday.de>
---
 .travis.yml   | 29 +++--------------------------
 generic-ci.sh |  3 ++-
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 69d6b2b..66a4572 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,34 +2,11 @@ language: generic
 dist: trusty
 sudo: false
 
-env:
-  matrix:
-  - DIST=trusty
-  global:
-    # 20170821: as of writing there is no 'latest' (hashicorp/packer/issues/5265)
-  - PACKER_CURRENT_VERSION="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | jq -r -M '.current_version')"
-  - PACKER_URL="https://releases.hashicorp.com/packer/$PACKER_CURRENT_VERSION/packer_${PACKER_CURRENT_VERSION}_linux_amd64.zip"
-  - PACKER_SHA256="https://releases.hashicorp.com/packer/$PACKER_CURRENT_VERSION/packer_${PACKER_CURRENT_VERSION}_SHA256SUMS"
-  - PACKER_SHA256_SIG="https://releases.hashicorp.com/packer/$PACKER_CURRENT_VERSION/packer_${PACKER_CURRENT_VERSION}_SHA256SUMS.sig"
-  - HASHICORP_FINGERPRINT=91a6e7f85d05c65630bef18951852d87348ffc4c
-  - HASHICORP_KEY="https://keybase.io/hashicorp/pgp_keys.asc?fingerprint=${HASHICORP_FINGERPRINT}"
-
 install:
-- wget ${PACKER_URL}
-- wget ${PACKER_SHA256}
-- wget ${PACKER_SHA256_SIG}
-- wget -O hashicorp.key ${HASHICORP_KEY}
-- gpg --with-fingerprint --with-colons hashicorp.key | grep ${HASHICORP_FINGERPRINT^^}
-- gpg --import hashicorp.key
-- gpg --verify packer_${PACKER_CURRENT_VERSION}_SHA256SUMS.sig packer_${PACKER_CURRENT_VERSION}_SHA256SUMS
-- grep linux_amd64 packer_${PACKER_CURRENT_VERSION}_SHA256SUMS > packer_SHA256SUM_linux_amd64
-- sha256sum --check --status packer_SHA256SUM_linux_amd64
-- unzip packer_${PACKER_CURRENT_VERSION}_linux_amd64.zip
+- ./generic-ci.sh install
 
 script:
-- ./packer --version
-- # ./packer validate  -var "iso_url=https://downloads.archlinux.de/iso/$(date +'%Y.%m').01/archlinux-$(date +'%Y.%m').01-x86_64.iso" -var "iso_checksum_url=https://downloads.archlinux.de/iso/$(date +'%Y.%m').01/sha1sums.txt"  vagrant.json
-- jq ".\"post-processors\"[0] |= map(select(.\"type\" != \"vagrant-cloud\"))" vagrant.json | ./packer validate -var "iso_url=https://downloads.archlinux.de/iso/$(date +'%Y.%m').01/archlinux-$(date +'%Y.%m').01-x86_64.iso" -var "iso_checksum_url=https://downloads.archlinux.de/iso/$(date +'%Y.%m').01/sha1sums.txt" -
+- ./generic-ci.sh verify
 
 notifications:
-  - email: false
+- email: false
diff --git a/generic-ci.sh b/generic-ci.sh
index 0fb7ce6..38c3b79 100755
--- a/generic-ci.sh
+++ b/generic-ci.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 
 case $1 in
 
@@ -16,7 +17,7 @@ case $1 in
     gpg --with-fingerprint --with-colons hashicorp.key | grep ${HASHICORP_FINGERPRINT^^}
     gpg --import hashicorp.key
     gpg --verify "packer_${PACKER_CURRENT_VERSION}_SHA256SUMS.sig" "packer_${PACKER_CURRENT_VERSION}_SHA256SUMS"
-    grep "linux_amd64 packer_${PACKER_CURRENT_VERSION}_SHA256SUMS" >packer_SHA256SUM_linux_amd64
+    grep linux_amd64 "packer_${PACKER_CURRENT_VERSION}_SHA256SUMS" > packer_SHA256SUM_linux_amd64
     sha256sum --check --status packer_SHA256SUM_linux_amd64
     unzip "packer_${PACKER_CURRENT_VERSION}_linux_amd64.zip"
     ;;