~craftyguy/ansible-nftables

5fb6f623ffd4d0fe1151be0f6251a0caefb38e3f — BhEaN 3 years ago 2cc7eab + 77dfaae
Merge branch 'fix-sed-parameter' into 'master'

Fix sed parameter

See merge request ansible-roles/nftables!17
5 files changed, 21 insertions(+), 6 deletions(-)

M .gitlab-ci.yml
M Makefile
M README.md
M molecule/default/molecule.yml
M requirements-tests.txt
M .gitlab-ci.yml => .gitlab-ci.yml +13 -2
@@ 4,7 4,7 @@ variables:
  GIT_STRATEGY: clone
  GIT_SUBMODULE_STRATEGY: none
  CI_DEBUG_TRACE: "false"
  DOCKER_IMAGE: code.vandalsweb.com:5005/vandalsweb/server-image-dind-for-molecule/server-image-dind-for-molecule:latest
  DOCKER_IMAGE: code.vandalsweb.com:5005/vandalsweb/builder-container-dind-for-molecule/dind-for-molecule:latest
  PIP_CACHE_DIR: "${CI_PROJECT_DIR}/.pip"

cache:


@@ 25,7 25,18 @@ tests:
  variables:
    VIRTUAL_ENV: fake
  before_script:
    - apk add --update python3 py-pip python3-dev gcc libc-dev libffi-dev openssl-dev linux-headers make git curl
    - apk add --no-cache
      python3
      py-pip
      python3-dev
      gcc
      libc-dev
      libffi-dev
      openssl-dev
      linux-headers
      make
      git
      curl
  script:
    - make deps
    - make tests

M Makefile => Makefile +1 -1
@@ 55,7 55,7 @@ deps/git-hooks:
		if [ "$$?" != "0" ]; then exit 1; fi; \
		$(call print_success, "Git-hooks initialized successfully!"); \
	fi
	@sed -i 's/^git-hooks/\.\/bin\/git-hooks/g' .git/hooks/*;
	@sed -i'' 's/^git-hooks/\.\/bin\/git-hooks/g' .git/hooks/*;

check-virtualenv:
	@$(call print_title, "Checking virtualenv:")

M README.md => README.md +4 -0
@@ 172,6 172,10 @@ Tools, external libraries, useful references and other third-part software used 
  messages.
- [Git-hooks](https://github.com/git-hooks/git-hooks): Hook manager.
- [Git-chglog](https://github.com/git-chglog/git-chglog): CHANGELOG generator.
- [Ansible](https://www.ansible.com/): Ansible is an open-source software provisioning, configuration management, and
  application-deployment tool enabling infrastructure as code.
- [Molecule](https://molecule.readthedocs.io/en/latest/): Molecule project is designed to aid in the development and testing of Ansible
  roles.
- [Linux Netfilter Nftables](https://netfilter.org/projects/nftables/index.html): This software provides a new in-kernel packet
  classification framework that is based on a network-specific Virtual Machine (VM) and a new nft userspace command line tool.


M molecule/default/molecule.yml => molecule/default/molecule.yml +1 -1
@@ 11,7 11,7 @@ driver:
platforms:
  # Debian 10 (BUSTER)
  - name: "molecule-nftables-debian10"
    image: code.vandalsweb.com:5005/vandalsweb/server-image-debian-stable/server-image-debian-stable:latest
    image: code.vandalsweb.com:5005/vandalsweb/builder-container-debian-stable/debian-stable:latest
    pre_build_image: true
    groups: [ provision_images ]
    privileged: false

M requirements-tests.txt => requirements-tests.txt +2 -2
@@ 1,5 1,5 @@
molecule~=3.1
molecule~=3.2
molecule-docker~=0.3
docker~=4.3
docker~=4.4
yamllint~=1.25
ansible-lint~=4.3