From 00b397cfdb68eeb514f4d57ce19ab0881c61bc20 Mon Sep 17 00:00:00 2001 From: David Zager Date: Thu, 14 Jun 2018 17:05:30 -0400 Subject: [PATCH] Update APB templates (#41559) --- lib/ansible/galaxy/data/apb/.travis.yml | 7 +++---- lib/ansible/galaxy/data/apb/apb.yml.j2 | 2 +- lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2 | 1 - lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2 | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/ansible/galaxy/data/apb/.travis.yml b/lib/ansible/galaxy/data/apb/.travis.yml index 93b5be42a26..44c0ba405bb 100644 --- a/lib/ansible/galaxy/data/apb/.travis.yml +++ b/lib/ansible/galaxy/data/apb/.travis.yml @@ -6,9 +6,7 @@ python: - '2.7' env: - - OPENSHIFT_VERSION=latest - - OPENSHIFT_VERSION=v3.9 - - KUBERNETES_VERSION=latest + - OPENSHIFT_VERSION=v3.9.0 - KUBERNETES_VERSION=v1.9.0 script: @@ -16,11 +14,12 @@ script: - export apb_name=APB_NAME # Download test shim. - - wget -O ${PWD}/apb-test.sh https://raw.githubusercontent.com/djzager/apb-test-shim/ansible-galaxy/apb-test.sh + - wget -O ${PWD}/apb-test.sh https://raw.githubusercontent.com/ansibleplaybookbundle/apb-test-shim/master/apb-test.sh - chmod +x ${PWD}/apb-test.sh # Run tests. - ${PWD}/apb-test.sh +# Uncomment to allow travis to notify galaxy # notifications: # webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/lib/ansible/galaxy/data/apb/apb.yml.j2 b/lib/ansible/galaxy/data/apb/apb.yml.j2 index 0282f004eb4..f96880196fe 100644 --- a/lib/ansible/galaxy/data/apb/apb.yml.j2 +++ b/lib/ansible/galaxy/data/apb/apb.yml.j2 @@ -1,4 +1,4 @@ -version: 1.0 +version: '1.0.0' name: {{ role_name }} description: {{ description }} bindable: False diff --git a/lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2 b/lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2 index a03f79bf830..33d5c899ee5 100644 --- a/lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2 +++ b/lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2 @@ -6,4 +6,3 @@ apb_action: deprovision roles: - role: {{ role_name }} - diff --git a/lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2 b/lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2 index d3e122831a7..e3379f27592 100644 --- a/lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2 +++ b/lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2 @@ -6,4 +6,3 @@ apb_action: provision roles: - role: {{ role_name }} -