From 947c7b95fa4da15faf7262fa33bc01d61fd8a6cf Mon Sep 17 00:00:00 2001 From: Hugo Haakseth Date: Wed, 14 Oct 2020 03:32:57 +0200 Subject: [PATCH] Removed ubuntu 14.04 support because there is no adoptopenjdk available. --- CHANGELOG.md | 1 + Vagrantfile | 2 +- metadata.json | 1 - spec/acceptance/nodesets/default.yml | 2 +- .../nodesets/ubuntu-1404-docker.yml | 25 ------------------- spec/acceptance/nodesets/ubuntu-1404.yml | 1 - 6 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 spec/acceptance/nodesets/ubuntu-1404-docker.yml delete mode 120000 spec/acceptance/nodesets/ubuntu-1404.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index d4077735..23ed306f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. Added RedHat and CentOS 8 support Removed Debian 7 support Added Debian 9 and 10 support + Removed Ubuntu 14.04 support Added Ubuntu 18.04 and 20.04 support Removed OpenSuSE support diff --git a/Vagrantfile b/Vagrantfile index 0da0bf43..517cbbf9 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -32,7 +32,7 @@ Vagrant.configure(2) do |config| config.vm.define 'test', autostart: false do |node| node.vm.box = 'bento/centos-7.8' node.vm.provider 'virtualbox' do |vm| - vm.memory = 4 * + vm.memory = 4 * 1024 vm.cpus = 2 end diff --git a/metadata.json b/metadata.json index 0eaf50bb..c544f721 100644 --- a/metadata.json +++ b/metadata.json @@ -58,7 +58,6 @@ { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "14.04", "16.04", "18.04", "20.04" diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml index d3846865..3d13b77b 120000 --- a/spec/acceptance/nodesets/default.yml +++ b/spec/acceptance/nodesets/default.yml @@ -1 +1 @@ -ubuntu-1404.yml \ No newline at end of file +ubuntu-1804-docker.yml \ No newline at end of file diff --git a/spec/acceptance/nodesets/ubuntu-1404-docker.yml b/spec/acceptance/nodesets/ubuntu-1404-docker.yml deleted file mode 100644 index ebfeb8c9..00000000 --- a/spec/acceptance/nodesets/ubuntu-1404-docker.yml +++ /dev/null @@ -1,25 +0,0 @@ -HOSTS: - ubuntu-14-04: - docker_cmd: - - "/sbin/init" - image: ubuntu:14.04 - platform: ubuntu-14.04-amd64 - packaging_platform: ubuntu-14.04-amd64 - docker_image_commands: - - cp /bin/true /sbin/agetty - - rm /usr/sbin/policy-rc.d - - rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl - - apt-get install -y net-tools wget apt-transport-https software-properties-common - - wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - - - add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ - - apt-get update && apt-get install -y adoptopenjdk-8-hotspot - - locale-gen en_US.UTF-8 - - echo LANG=en_US.UTF-8 > /etc/default/locale - hypervisor: docker - roles: - - agent - docker_preserve_image: true - -CONFIG: - type: foss - :trace_limit: 100 # Get more than 10 lines of trace when something fails. diff --git a/spec/acceptance/nodesets/ubuntu-1404.yml b/spec/acceptance/nodesets/ubuntu-1404.yml deleted file mode 120000 index bd89387b..00000000 --- a/spec/acceptance/nodesets/ubuntu-1404.yml +++ /dev/null @@ -1 +0,0 @@ -ubuntu-1404-docker.yml \ No newline at end of file