Skip to content
This repository has been archived by the owner on Feb 13, 2023. It is now read-only.

Commit

Permalink
Update Solr and Memcached roles to latest versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
geerlingguy committed Mar 29, 2021
1 parent 2898d88 commit 733000d
Show file tree
Hide file tree
Showing 29 changed files with 259 additions and 106 deletions.
4 changes: 2 additions & 2 deletions provisioning/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ roles:
- name: geerlingguy.mailhog
version: 2.2.0
- name: geerlingguy.memcached
version: 1.1.0
version: 2.0.0
- name: geerlingguy.mysql
version: 3.3.0
- name: geerlingguy.nginx
Expand Down Expand Up @@ -79,6 +79,6 @@ roles:
- name: geerlingguy.security
version: 2.0.0
- name: geerlingguy.solr
version: 5.1.1
version: 5.2.0
- name: geerlingguy.varnish
version: 3.3.0
3 changes: 3 additions & 0 deletions provisioning/roles/geerlingguy.memcached/.ansible-lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
skip_list:
- 'yaml'
- 'role-name'
66 changes: 66 additions & 0 deletions provisioning/roles/geerlingguy.memcached/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
---
name: CI
'on':
pull_request:
push:
branches:
- master
schedule:
- cron: "30 3 * * 3"

defaults:
run:
working-directory: 'geerlingguy.memcached'

jobs:

lint:
name: Lint
runs-on: ubuntu-latest
steps:
- name: Check out the codebase.
uses: actions/checkout@v2
with:
path: 'geerlingguy.memcached'

- name: Set up Python 3.
uses: actions/setup-python@v2
with:
python-version: '3.x'

- name: Install test dependencies.
run: pip3 install yamllint

- name: Lint code.
run: |
yamllint .
molecule:
name: Molecule
runs-on: ubuntu-latest
strategy:
matrix:
distro:
- centos7
- ubuntu1804

steps:
- name: Check out the codebase.
uses: actions/checkout@v2
with:
path: 'geerlingguy.memcached'

- name: Set up Python 3.
uses: actions/setup-python@v2
with:
python-version: '3.x'

- name: Install test dependencies.
run: pip3 install ansible molecule[docker] docker

- name: Run Molecule tests.
run: molecule test
env:
PY_COLORS: '1'
ANSIBLE_FORCE_COLOR: '1'
MOLECULE_DISTRO: ${{ matrix.distro }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
# This workflow requires a GALAXY_API_KEY secret present in the GitHub
# repository or organization.
#
# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
# See: https://github.com/ansible/galaxy/issues/46

name: Release
'on':
push:
tags:
- '*'

defaults:
run:
working-directory: 'geerlingguy.memcached'

jobs:

release:
name: Release
runs-on: ubuntu-latest
steps:
- name: Check out the codebase.
uses: actions/checkout@v2
with:
path: 'geerlingguy.memcached'

- name: Set up Python 3.
uses: actions/setup-python@v2
with:
python-version: '3.x'

- name: Install Ansible.
run: pip3 install ansible-base

- name: Trigger a new import on Galaxy.
run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
2 changes: 2 additions & 0 deletions provisioning/roles/geerlingguy.memcached/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
*.retry
*/__pycache__
*.pyc
.cache

28 changes: 0 additions & 28 deletions provisioning/roles/geerlingguy.memcached/.travis.yml

This file was deleted.

4 changes: 4 additions & 0 deletions provisioning/roles/geerlingguy.memcached/.yamllint
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
---
extends: default

rules:
line-length:
max: 120
level: warning

ignore: |
.github/stale.yml
2 changes: 1 addition & 1 deletion provisioning/roles/geerlingguy.memcached/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Ansible Role: Memcached

[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-memcached.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-memcached)
[![CI](https://github.com/geerlingguy/ansible-role-memcached/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-memcached/actions?query=workflow%3ACI)

An Ansible Role that installs Memcached on RedHat/CentOS or Debian/Ubuntu Linux.

Expand Down
1 change: 0 additions & 1 deletion provisioning/roles/geerlingguy.memcached/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
- name: restart memcached
service: name=memcached state=restarted
when: not memcached_install.changed
2 changes: 1 addition & 1 deletion provisioning/roles/geerlingguy.memcached/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
dependencies: []

galaxy_info:
role_name: memcached
author: geerlingguy
description: Memcached for Linux
company: "Midwestern Mac, LLC"
Expand All @@ -10,7 +11,6 @@ galaxy_info:
platforms:
- name: EL
versions:
- 6
- 7
- 8
- name: Ubuntu
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ dependency:
name: galaxy
driver:
name: docker
lint: |
set -e
yamllint .
ansible-lint
platforms:
- name: instance
image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
Expand Down
3 changes: 2 additions & 1 deletion provisioning/roles/geerlingguy.solr/.ansible-lint
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
skip_list:
- '106'
- 'yaml'
- 'role-name'
88 changes: 88 additions & 0 deletions provisioning/roles/geerlingguy.solr/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
---
name: CI
'on':
pull_request:
push:
branches:
- master
schedule:
- cron: "30 6 * * 2"

defaults:
run:
working-directory: 'geerlingguy.solr'

jobs:

lint:
name: Lint
runs-on: ubuntu-latest
steps:
- name: Check out the codebase.
uses: actions/checkout@v2
with:
path: 'geerlingguy.solr'

- name: Set up Python 3.
uses: actions/setup-python@v2
with:
python-version: '3.x'

- name: Install test dependencies.
run: pip3 install yamllint

- name: Lint code.
run: |
yamllint .
molecule:
name: Molecule
runs-on: ubuntu-latest
strategy:
matrix:
include:
# Solr 8.
- distro: centos7
playbook: converge.yml
- distro: ubuntu1804
playbook: converge.yml
- distro: debian10
playbook: converge.yml

# Solr 7.
- distro: centos7
playbook: solr-7.yml
- distro: debian10
playbook: solr-7.yml

# Older versions.
- distro: ubuntu1604
playbook: solr-6.yml
- distro: ubuntu1604
playbook: solr-5.yml
- distro: ubuntu1604
playbook: solr-4.yml
- distro: ubuntu1604
playbook: solr-3.yml

steps:
- name: Check out the codebase.
uses: actions/checkout@v2
with:
path: 'geerlingguy.solr'

- name: Set up Python 3.
uses: actions/setup-python@v2
with:
python-version: '3.x'

- name: Install test dependencies.
run: pip3 install ansible molecule[docker] docker

- name: Run Molecule tests.
run: molecule test
env:
PY_COLORS: '1'
ANSIBLE_FORCE_COLOR: '1'
MOLECULE_DISTRO: ${{ matrix.distro }}
MOLECULE_PLAYBOOK: ${{ matrix.playbook }}
38 changes: 38 additions & 0 deletions provisioning/roles/geerlingguy.solr/.github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
# This workflow requires a GALAXY_API_KEY secret present in the GitHub
# repository or organization.
#
# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
# See: https://github.com/ansible/galaxy/issues/46

name: Release
'on':
push:
tags:
- '*'

defaults:
run:
working-directory: 'geerlingguy.solr'

jobs:

release:
name: Release
runs-on: ubuntu-latest
steps:
- name: Check out the codebase.
uses: actions/checkout@v2
with:
path: 'geerlingguy.solr'

- name: Set up Python 3.
uses: actions/setup-python@v2
with:
python-version: '3.x'

- name: Install Ansible.
run: pip3 install ansible-base

- name: Trigger a new import on Galaxy.
run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
2 changes: 2 additions & 0 deletions provisioning/roles/geerlingguy.solr/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
*.retry
*/__pycache__
*.pyc
.cache

Loading

0 comments on commit 733000d

Please sign in to comment.