From f879dcbb88d4a3a0f19d8b0cb2a72f50cf09de4a Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Tue, 30 Apr 2019 14:33:07 +0200 Subject: [PATCH] remove eol'd OS and add new (#22) * remove eol'd OS and add new Signed-off-by: Sebastian Gumprich * remove amazon and fedora Signed-off-by: Sebastian Gumprich --- .kitchen.vagrant.yml | 45 +++++++++++++-------------------------- .kitchen.yml | 8 ------- .travis.yml | 50 +++++++++++++++++++++++--------------------- meta/main.yml | 4 ---- 4 files changed, 40 insertions(+), 67 deletions(-) diff --git a/.kitchen.vagrant.yml b/.kitchen.vagrant.yml index a2a4126..5debc57 100644 --- a/.kitchen.vagrant.yml +++ b/.kitchen.vagrant.yml @@ -25,47 +25,30 @@ transport: max_ssh_sessions: 5 platforms: -- name: ubuntu-12.04 - driver_config: - box: opscode-ubuntu-12.04 - box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box -- name: ubuntu-14.04 - driver_config: - box: opscode-ubuntu-14.04 - box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box - name: ubuntu-16.04 driver_config: - box: opscode-ubuntu-16.04 - box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-16.04_chef-provisionerless.box -- name: centos-6.4 + box: bento/ubuntu-16.04 +- name: ubuntu-18.04 driver_config: - box: opscode-centos-6.4 - box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box -- name: centos-6.5 + box: bento/ubuntu-18.04 +- name: centos-6 driver_config: - box: opscode-centos-6.5 - box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box -- name: centos-6.8 - driver_config: - box: bento/centos-6.8 + box: bento/centos-6 - name: centos-7 driver_config: - box: bento/centos-7.2 -- name: oracle-6.4 + box: bento/centos-7 +- name: oracle-6 driver_config: - box: oracle-6.4 - box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel64-64.box -- name: oracle-6.5 - driver_config: - box: oracle-6.5 - box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel65-64.box + box: bento/oracle-6 - name: oracle-7 driver_config: - box: boxcutter/ol72 -- name: debian-8 + box: bento/oracle-7 +- name: debian-9 driver_config: - box: debian-8 - box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box + box: bento/debian-9 +- name: amazon + driver_config: + box: bento/amazonlinux-2 verifier: name: inspec diff --git a/.kitchen.yml b/.kitchen.yml index fe0adf0..277cc85 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -50,10 +50,6 @@ platforms: provision_command: - sed -i 's/UsePAM yes/UsePAM no/g' /etc/ssh/sshd_config - systemctl enable sshd.service -- name: ubuntu1404-ansible-latest - driver: - image: rndmh3ro/docker-ubuntu1404-ansible:latest - platform: ubuntu - name: ubuntu1604-ansible-latest driver: image: rndmh3ro/docker-ubuntu1604-ansible:latest @@ -68,10 +64,6 @@ platforms: run_command: /sbin/init provision_command: - systemctl enable ssh.service -- name: debian8-ansible-latest - driver: - image: rndmh3ro/docker-debian8-ansible:latest - platform: debian - name: debian9-ansible-latest driver: image: rndmh3ro/docker-debian9-ansible:latest diff --git a/.travis.yml b/.travis.yml index 27a529f..0ddb9af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ env: version: latest init: /sbin/init test_playbook: test.yml - + - distro: centos7 init: /lib/systemd/systemd run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" @@ -18,11 +18,6 @@ env: init: /sbin/init test_playbook: test.yml - - distro: ubuntu1404 - version: latest - init: /sbin/init - test_playbook: test.yml - - distro: ubuntu1604 version: latest init: /lib/systemd/systemd @@ -35,18 +30,24 @@ env: run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" test_playbook: test.yml - - distro: debian8 - version: latest - init: /sbin/init - run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" - test_playbook: test.yml - - distro: debian9 version: latest init: /lib/systemd/systemd run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" test_playbook: test.yml +# - distro: amazon +# init: /lib/systemd/systemd +# version: latest +# run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" +# test_playbook: test.yml +# +# - distro: fedora +# init: /lib/systemd/systemd +# version: latest +# run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" +# test_playbook: test.yml + - distro: centos6 version: latest init: /sbin/init @@ -64,11 +65,6 @@ env: init: /sbin/init test_playbook: official-nginx-role-redhat.yml - - distro: ubuntu1404 - version: latest - init: /sbin/init - test_playbook: official-nginx-role-debian.yml - - distro: ubuntu1604 version: latest init: /lib/systemd/systemd @@ -81,18 +77,24 @@ env: run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" test_playbook: official-nginx-role-debian.yml - - distro: debian8 - version: latest - init: /sbin/init - run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" - test_playbook: official-nginx-role-debian.yml - - distro: debian9 version: latest init: /lib/systemd/systemd run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" test_playbook: official-nginx-role-debian.yml +# - distro: amazon +# init: /lib/systemd/systemd +# version: latest +# run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" +# test_playbook: official-nginx-role-debian.yml +# +# - distro: fedora +# init: /lib/systemd/systemd +# version: latest +# run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" +# test_playbook: official-nginx-role-debian.yml + before_install: # Pull container @@ -113,4 +115,4 @@ script: - 'inspec exec https://github.com/dev-sec/nginx-baseline/ -t docker://$(cat ${container_id}) --controls=nginx-01 nginx-02 nginx-03 nginx-05 nginx-06 nginx-07 nginx-08 nginx-09 nginx-10 nginx-12 nginx-13 nginx-15 nginx-17 --no-distinct-exit' notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/meta/main.yml b/meta/main.yml index 0fdf309..d7f517f 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -12,14 +12,10 @@ galaxy_info: - 7 - name: Ubuntu versions: - - precise - - trusty - xenial - bionic - name: Debian versions: - - wheezy - - jessie - stretch galaxy_tags: - system