From 9d33eed97a4b6fc953cfe720e1885917ee51a680 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Mon, 31 Jul 2017 16:22:23 -0400
Subject: [PATCH 1/2] Migrate from Travis to Papr (formerly redhat-ci)

It's extremely difficult to maintain a CI testing envornment when
it's base is an ancient Ubuntu-based distro that doesn't keep
pace with upstream kernel features and fixes.  Switch to Papr,
which allows testing based off of very-modern Fedora releases.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .papr.yml       | 64 +++++++++++++++++++++++++++++++++++++++++++++++++
 .papr_first.sh  |  7 ++++++
 .papr_second.sh |  9 +++++++
 .papr_third.sh  | 12 ++++++++++
 .travis.yml     | 40 -------------------------------
 5 files changed, 92 insertions(+), 40 deletions(-)
 create mode 100644 .papr.yml
 create mode 100644 .papr_first.sh
 create mode 100644 .papr_second.sh
 create mode 100644 .papr_third.sh
 delete mode 100644 .travis.yml

diff --git a/.papr.yml b/.papr.yml
new file mode 100644
index 00000000..11c938c7
--- /dev/null
+++ b/.papr.yml
@@ -0,0 +1,64 @@
+
+---
+
+host:
+    distro: fedora/26/cloud
+    context: 'Go-tip'
+
+env:
+  go_version: "tip"
+
+timeout: 30m
+
+packages:
+  - btrfs-tools
+  - libdevmapper-devel
+  - libgpgme11-devel
+  - libapparmor-devel
+  - libseccomp-devel
+  - autoconf
+  - automake
+  - bison
+  - e2fslibs-devel
+  - libfuse-devel
+  - libtool
+  - liblzma-devel
+  - docker
+
+tests:
+  # Set common env. vars here, so only $go_version needs to vary between contexts
+  - export PATH="$HOME/gopath/bin:$PATH"
+  - export LD_LIBRARY_PATH="/usr/local/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
+  - export
+  - |
+      # Script filenames easily renamed, don't forget to upd artifacts (below)
+      for filename in .papr_first.sh .papr_second.sh .papr_third.sh:
+      do
+          echo "------------------------------------------------------"
+          echo "------------------- $filename"
+          echo "------------------------------------------------------"
+          "./$filename" &> ${filename}.output || break;
+      done
+
+artifacts:
+    - .papr_first.sh.output
+    - .papr_second.sh.output
+    - .papr_third.sh.output
+
+---
+
+context: 'Go-1.8.x'
+env:
+  go_version: "1.8.x"
+
+---
+
+context: 'Go-1.7.x'
+env:
+  go_version: "1.7.x"
+
+---
+
+context: 'Go-1.6.x'
+env:
+  go_version: "1.6.x"
diff --git a/.papr_first.sh b/.papr_first.sh
new file mode 100644
index 00000000..9a63464e
--- /dev/null
+++ b/.papr_first.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+echo "...pretend installing $go_version down /usr/local..."
+
+make install.tools
diff --git a/.papr_second.sh b/.papr_second.sh
new file mode 100644
index 00000000..fb8cd1ed
--- /dev/null
+++ b/.papr_second.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -ex
+
+git clone https://github.com/ostreedev/ostree ../ostree
+cd ../ostree
+./autogen.sh --prefix=/usr/local
+make all
+sudo make install
diff --git a/.papr_third.sh b/.papr_third.sh
new file mode 100644
index 00000000..943f6220
--- /dev/null
+++ b/.papr_third.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -ex
+
+make .gitvalidation
+make gofmt
+make lint
+make integration
+make docs
+make
+
+echo "... pretending to send notification to chat.freenode.net#cri-o ..."
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 427989e6..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-language: go
-go:
-  - 1.6.x
-  - 1.7.x
-  - 1.8.x
-  - tip
-
-sudo: required
-
-services:
-  - docker
-
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get -qq install btrfs-tools libdevmapper-dev libgpgme11-dev libapparmor-dev libseccomp-dev
-  - sudo apt-get -qq install autoconf automake bison e2fslibs-dev libfuse-dev libtool liblzma-dev
-
-install:
-  - make install.tools
-  - git clone https://github.com/ostreedev/ostree ${TRAVIS_BUILD_DIR}/ostree
-  - pushd ${TRAVIS_BUILD_DIR}/ostree
-  -   ./autogen.sh --prefix=/usr/local
-  -   make all
-  -   sudo make install
-  - popd
-
-before_script:
-  - export PATH=$HOME/gopath/bin:$PATH
-  - export LD_LIBRARY_PATH=/usr/local/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-
-script:
-  - make .gitvalidation
-  - make gofmt
-  - make lint
-  - make integration
-  - make docs
-  - make
-
-notifications:
-  irc: "chat.freenode.net#cri-o"

From 41ebb36e9de91662f721599f324bc9505557d0ff Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Wed, 2 Aug 2017 16:25:01 -0400
Subject: [PATCH 2/2] fixup! Migrate from Travis to Papr (formerly redhat-ci)

Put travis configuration back as requested.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .travis.yml | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..427989e6
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,40 @@
+language: go
+go:
+  - 1.6.x
+  - 1.7.x
+  - 1.8.x
+  - tip
+
+sudo: required
+
+services:
+  - docker
+
+before_install:
+  - sudo apt-get -qq update
+  - sudo apt-get -qq install btrfs-tools libdevmapper-dev libgpgme11-dev libapparmor-dev libseccomp-dev
+  - sudo apt-get -qq install autoconf automake bison e2fslibs-dev libfuse-dev libtool liblzma-dev
+
+install:
+  - make install.tools
+  - git clone https://github.com/ostreedev/ostree ${TRAVIS_BUILD_DIR}/ostree
+  - pushd ${TRAVIS_BUILD_DIR}/ostree
+  -   ./autogen.sh --prefix=/usr/local
+  -   make all
+  -   sudo make install
+  - popd
+
+before_script:
+  - export PATH=$HOME/gopath/bin:$PATH
+  - export LD_LIBRARY_PATH=/usr/local/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+
+script:
+  - make .gitvalidation
+  - make gofmt
+  - make lint
+  - make integration
+  - make docs
+  - make
+
+notifications:
+  irc: "chat.freenode.net#cri-o"