Skip to content

Commit

Permalink
Merge pull request #15 from cimon-io/update
Browse files Browse the repository at this point in the history
upgrade role
  • Loading branch information
merifri authored Nov 12, 2021
2 parents 365d881 + 1f12180 commit 22632cf
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 51 deletions.
38 changes: 16 additions & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,26 @@
---
language: python
python: "2.7"

dist: bionic
sudo: required
dist: trusty
services:
- docker

env:
matrix:
- IMAGE_NAME="debian9" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="golang.yml" PLUGIN_EXEC="go version"
- IMAGE_NAME="ubuntu18.04" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="golang.yml" PLUGIN_EXEC="go version"
- IMAGE_NAME="centos7" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="golang.yml" PLUGIN_EXEC="go version"
- IMAGE_NAME="debian9" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="elixir.yml" PLUGIN_EXEC="elixir --version"
- IMAGE_NAME="ubuntu18.04" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="elixir.yml" PLUGIN_EXEC="elixir --version"
- IMAGE_NAME="centos7" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="elixir.yml" PLUGIN_EXEC="elixir --version"
- IMAGE_NAME="debian9" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="ruby.yml" PLUGIN_EXEC="ruby --version"
- IMAGE_NAME="ubuntu18.04" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="ruby.yml" PLUGIN_EXEC="ruby --version"
- IMAGE_NAME="centos7" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="ruby.yml" PLUGIN_EXEC="ruby --version"
#- IMAGE_NAME="debian9" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="php.yml" PLUGIN_EXEC="php --version"
#- IMAGE_NAME="ubuntu18.04" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="php.yml" PLUGIN_EXEC="php --version"
#- IMAGE_NAME="centos7" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="php.yml" PLUGIN_EXEC="php --version"
- IMAGE_NAME="debian9" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="nodejs.yml" PLUGIN_EXEC="node --version"
- IMAGE_NAME="ubuntu18.04" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="nodejs.yml" PLUGIN_EXEC="node --version"
- IMAGE_NAME="centos7" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="nodejs.yml" PLUGIN_EXEC="node --version"
- IMAGE_NAME="debian9" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="lua.yml" PLUGIN_EXEC="lua -v"
- IMAGE_NAME="ubuntu18.04" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="lua.yml" PLUGIN_EXEC="lua -v"
- IMAGE_NAME="centos7" ANSIBLE_VERSION="2.7.4" PLAYBOOK_FILE="lua.yml" PLUGIN_EXEC="lua -v"
- IMAGE_NAME="debian10" ANSIBLE_VERSION="4.8.0" PLAYBOOK_FILE="golang.yml" PLUGIN_EXEC="go version"
- IMAGE_NAME="ubuntu20.04" ANSIBLE_VERSION="4.8.0" PLAYBOOK_FILE="golang.yml" PLUGIN_EXEC="go version"
- IMAGE_NAME="centos7" ANSIBLE_VERSION="4.8.0" PLAYBOOK_FILE="golang.yml" PLUGIN_EXEC="go version"
- IMAGE_NAME="debian10" ANSIBLE_VERSION="4.8.0" PLAYBOOK_FILE="elixir.yml" PLUGIN_EXEC="elixir --version"
- IMAGE_NAME="ubuntu20.04" ANSIBLE_VERSION="4.8.0" PLAYBOOK_FILE="elixir.yml" PLUGIN_EXEC="elixir --version"
- IMAGE_NAME="centos7" ANSIBLE_VERSION="4.8.0" PLAYBOOK_FILE="elixir.yml" PLUGIN_EXEC="elixir --version"
- IMAGE_NAME="debian10" ANSIBLE_VERSION="4.8.0" PLAYBOOK_FILE="ruby.yml" PLUGIN_EXEC="ruby --version"
- IMAGE_NAME="ubuntu20.04" ANSIBLE_VERSION="4.8.0" PLAYBOOK_FILE="ruby.yml" PLUGIN_EXEC="ruby --version"
- IMAGE_NAME="centos7" ANSIBLE_VERSION="4.8.0" PLAYBOOK_FILE="ruby.yml" PLUGIN_EXEC="ruby --version"
- IMAGE_NAME="debian10" ANSIBLE_VERSION="4.8.0" PLAYBOOK_FILE="nodejs.yml" PLUGIN_EXEC="node --version"
- IMAGE_NAME="ubuntu20.04" ANSIBLE_VERSION="4.8.0" PLAYBOOK_FILE="nodejs.yml" PLUGIN_EXEC="node --version"
- IMAGE_NAME="centos7" ANSIBLE_VERSION="4.8.0" PLAYBOOK_FILE="nodejs.yml" PLUGIN_EXEC="node --version"
- IMAGE_NAME="debian10" ANSIBLE_VERSION="4.8.0" PLAYBOOK_FILE="lua.yml" PLUGIN_EXEC="lua -v"
- IMAGE_NAME="ubuntu20.04" ANSIBLE_VERSION="4.8.0" PLAYBOOK_FILE="lua.yml" PLUGIN_EXEC="lua -v"
- IMAGE_NAME="centos7" ANSIBLE_VERSION="4.8.0" PLAYBOOK_FILE="lua.yml" PLUGIN_EXEC="lua -v"

script:
- docker build -t $IMAGE_NAME --build-arg ANSIBLE_VERSION="$ANSIBLE_VERSION" --build-arg PLAYBOOK_FILE="$PLAYBOOK_FILE" --build-arg PLUGIN_EXEC="$PLUGIN_EXEC" -f tests/Dockerfile-$IMAGE_NAME .
Expand Down
2 changes: 2 additions & 0 deletions ansible.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[defaults]
roles_path = ../
allow_world_readable_tmpfiles = True
interpreter_python = auto
remote_tmp = /tmp
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# defaults file for asdf
asdf_version: "v0.7.6"
asdf_version: "v0.8.1"
asdf_user: "deploy"
asdf_legacy_version_file: "yes"

Expand Down
4 changes: 2 additions & 2 deletions tests/Dockerfile-debian9 → tests/Dockerfile-debian10
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:9
FROM debian:10

ARG ANSIBLE_VERSION="2.7.4"
ARG ANSIBLE_VERSION="4.8.0"
ARG PLAYBOOK_FILE="golang.yml"
ARG PLUGIN_EXEC="go version"

Expand Down
22 changes: 0 additions & 22 deletions tests/Dockerfile-ubuntu16.04

This file was deleted.

4 changes: 2 additions & 2 deletions tests/Dockerfile-ubuntu18.04 → tests/Dockerfile-ubuntu20.04
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:18.04
FROM ubuntu:20.04

ARG ANSIBLE_VERSION="2.7.4"
ARG ANSIBLE_VERSION="4.8.0"
ARG PLAYBOOK_FILE="golang.yml"
ARG PLUGIN_EXEC="go version"

Expand Down
2 changes: 1 addition & 1 deletion tests/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
- role: ansible-role-asdf
asdf_plugins:
- name: "nodejs"
versions: ["10.15.0"]
versions: ["16.13.0"]
2 changes: 1 addition & 1 deletion tests/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
- role: ansible-role-asdf
asdf_plugins:
- name: "ruby"
versions: ["2.6.0"]
versions: ["3.0.0"]

0 comments on commit 22632cf

Please sign in to comment.