From c3564f4773ec33b4d64bad5aeebe1f51c08c6d76 Mon Sep 17 00:00:00 2001
From: Paul Bonaud <paul.bonaud@fretlink.com>
Date: Thu, 2 Jan 2020 13:48:25 +0100
Subject: ci: use latest version of Nix binaries and latest Ansible nix pkgs

---
 .travis.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 7bf8ed8..1deea24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,24 @@
 ---
 language: nix
+nix: 2.3.1
+
 
 # Use the new container infrastructure
 sudo: false
 
 install:
+  # Update nix channels
+  - nix-channel --add https://nixos.org/channels/nixpkgs-19.09-darwin nixpkgs
+  - nix-channel --remove nixpkgs-unstable
+  - nix-channel --update
+
   # Install ansible
-  - nix-env -i python2.7-ansible python2.7-ansible-lint
+  - nix-env -i ansible ansible-lint
   - nix-env -if ./dhall-1.26.1.nix
 
   # Check ansible version
   - ansible --version
+  - ansible-lint --version
 
   # Create ansible.cfg with correct roles_path
   - printf '[defaults]\nroles_path=../' >ansible.cfg
-- 
cgit v1.2.3


From a3c4b3d5444e5d79afbd823a9acc12220a91f41f Mon Sep 17 00:00:00 2001
From: Paul Bonaud <paul.bonaud@fretlink.com>
Date: Thu, 2 Jan 2020 15:25:06 +0100
Subject: tests: fake a Kong server

---
 .travis.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 1deea24..14ab868 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ install:
   - nix-channel --update
 
   # Install ansible
-  - nix-env -i ansible ansible-lint
+  - nix-env -i python3 ansible ansible-lint
   - nix-env -if ./dhall-1.26.1.nix
 
   # Check ansible version
@@ -22,12 +22,15 @@ install:
 
   # Create ansible.cfg with correct roles_path
   - printf '[defaults]\nroles_path=../' >ansible.cfg
+  # Basic webserver to fake a Kong
+  - |
+    ./tests/kong.py&
 
 script:
   # Basic role syntax check
   - ansible-playbook tests/test.yml -i tests/inventory --syntax-check
   - ansible-lint .
-  - ansible-playbook tests/test.yml -i tests/inventory -C -D
+  - ansible-playbook tests/test.yml -i tests/inventory -D
   - scripts/dhall_check.sh
 
 notifications:
-- 
cgit v1.2.3