Browse Source

Merge pull request 'Fix kitchen' (#3) from hotfix/rhel into master

Reviewed-by: Guillaume Donval <guillaume.donval@fxinnovation.com>
Reviewed-by: quentin.vallin <quentin.vallin@fxinnovation.com>
tags/0.0.3
Julien Cabillot 11 months ago
parent
commit
16aeea863d
4 changed files with 14 additions and 10 deletions
  1. +3
    -1
      .pre-commit-config.yaml
  2. +5
    -0
      CHANGELOG.md
  3. +5
    -8
      kitchen.yml
  4. +1
    -1
      tasks/setup-RedHat.yml

+ 3
- 1
.pre-commit-config.yaml View File

@@ -1,6 +1,6 @@
repos:
- repo: git://github.com/pre-commit/pre-commit-hooks
rev: v2.4.0
rev: v3.2.0
hooks:
- id: check-merge-conflict
- id: trailing-whitespace
@@ -8,3 +8,5 @@ repos:
- id: check-added-large-files
- id: detect-private-key
- id: check-yaml
- id: check-case-conflict
- id: mixed-line-ending

+ 5
- 0
CHANGELOG.md View File

@@ -1,5 +1,10 @@
# CHANGELOG

## 0.0.3

* fix: RHEL 7.8, match new repo name
* fix: kitchen

## 0.0.2

* Fix RHEL installation (extra repo)

+ 5
- 8
kitchen.yml View File

@@ -3,16 +3,12 @@
driver:
name: "ec2"
associate_public_ip: true
aws_ssh_key_id: "fxlab_jenkins"
interface: "public"
region: "us-east-1"
require_chef_omnibus: false
subnet_id: "subnet-cd28dca9"
iam_profile_name: "AmazonEC2ReadOnlyAccess"

transport:
name: "ssh"
ssh_key: "/id_rsa.pem"
username: "ec2-user"
connection_retries: 5
connection_retry_sleep: 30
@@ -27,8 +23,9 @@ provisioner:
ansible_verbose: false
ansible_verbosity: 2
require_pip: true
ansible_version: "2.7.10"
ansible_version: "2.7.18"
idempotency_test: true
idempotency_skip_tags: ["kitchen_idempotency_skip_tag"]
require_chef_for_busser: false
require_ruby_for_busser: false
role_name: "ansible-role-docker"
@@ -42,7 +39,7 @@ platforms:
name: "RHEL-7.*_HVM_GA*"
owner-id: "309956199498"
tags:
Name: "tk-ansible-role-docker"
Name: "tk-ansible-role-docker-rhel"
kitchen: "true"
packer: "true"
- name: "centos-7"
@@ -53,7 +50,7 @@ platforms:
product-code: "aw0evgkw8e5c1q413zgy5pjce"
instance_type: "t3.small"
tags:
Name: "tk-ansible-role-docker"
Name: "tk-ansible-role-docker-centos"
kitchen: "true"
packer: "true"
transport:
@@ -62,7 +59,7 @@ platforms:
driver:
instance_type: "t3.small"
tags:
Name: "tk-ansible-role-docker"
Name: "tk-ansible-role-docker-amazon"
kitchen: "true"
packer: "true"



+ 1
- 1
tasks/setup-RedHat.yml View File

@@ -40,7 +40,7 @@
shell:
cmd: |
set -o pipefail;
yum repolist all | egrep -e '^[!*]?rhui-REGION-rhel-server-extras' -e '^[!*]?rhel-7-server-extras-rpms' | sed -r 's#^[!*]?([^/]*)/.*#\1#'
yum repolist all | egrep -e '^[!*]?rhui-REGION-rhel-server-extras' -e '^[!*]?rhel-7-server-extras-rpms' -e '^[!*]?(rhui-)?rhel-7-server-rhui-extras-rpms' | sed -r 's#^[!*]?([^/]*)/.*#\1#'
args:
warn: 'no'
register: 'redhat_extrarepo'


Loading…
Cancel
Save