diff --git a/.ci/build_base.sh b/.ci/build_base.sh index c431ea5c0..50df66882 100755 --- a/.ci/build_base.sh +++ b/.ci/build_base.sh @@ -2,9 +2,6 @@ set -xe case $MATRIX_IMAGE in - amazonlinux*) - format="rpm" - ;; centos*) format="rpm" ;; diff --git a/.ci/build_packages.sh b/.ci/build_packages.sh index 8f4dfab28..5f9271734 100755 --- a/.ci/build_packages.sh +++ b/.ci/build_packages.sh @@ -5,9 +5,6 @@ base_image="ghcr.io/firezone/${MATRIX_IMAGE}" tag="ghcr.io/firezone/release-${MATRIX_IMAGE/:/_}:${GITHUB_SHA}" case $MATRIX_IMAGE in - amazonlinux*) - format="rpm" - ;; centos*) format="rpm" ;; diff --git a/.ci/vagrant-runner-cache b/.ci/vagrant-runner-cache index fea88c6bb..b5c061670 100644 --- a/.ci/vagrant-runner-cache +++ b/.ci/vagrant-runner-cache @@ -1,5 +1,4 @@ # Caches vagrant boxes for github actions. Modifications to this file will evict the cache to redownload boxes. -bento/amazonlinux-2 generic/centos7 generic/centos8 generic/debian10 diff --git a/.github/workflows/build_base_images.yml b/.github/workflows/build_base_images.yml index 7d9ea09da..8097577d9 100644 --- a/.github/workflows/build_base_images.yml +++ b/.github/workflows/build_base_images.yml @@ -12,7 +12,6 @@ jobs: strategy: matrix: image: - - amazonlinux:2 - centos:7 - centos:8 - fedora:33 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 626d6216e..1498c6836 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,7 +79,6 @@ jobs: platform: - linux/amd64 image: - - amazonlinux:2 - centos:7 - centos:8 - debian:10 @@ -112,7 +111,6 @@ jobs: strategy: matrix: os: - - amazonlinux_2 - centos_7 - centos_8 - debian_10 @@ -142,7 +140,6 @@ jobs: strategy: matrix: os: - - amazonlinux_2 - debian_10 - ubuntu_18.04 - ubuntu_20.04 diff --git a/Vagrantfile b/Vagrantfile index 00bfd6058..8144680e0 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,14 +5,6 @@ # Github Actions supports vagrant on the macos host. Vagrant.configure('2') do |config| - config.vm.define "amazonlinux_2" do |amazonlinux2| - amazonlinux2.vm.box = "bento/amazonlinux-2" - amazonlinux2.vm.network "forwarded_port", guest: 8800, host: 8800 - source_file = Dir["firezone*amazonlinux_2*.rpm"].first - amazonlinux2.vm.provision "file", source: source_file, destination: "/tmp/" - amazonlinux2.vm.provision "shell", path: "scripts/provision/amazonlinux_2.sh" - end - config.vm.define "centos_7" do |centos7| centos7.vm.box = "generic/centos7" centos7.vm.network "forwarded_port", guest: 8800, host: 8800 diff --git a/scripts/build_base.sh b/scripts/build_base.sh index 3812dd422..7538b4b4f 100755 --- a/scripts/build_base.sh +++ b/scripts/build_base.sh @@ -14,8 +14,7 @@ elif [ `uname -m` = "arm64" ]; then docker buildx create --use fi -declare -a matrix_images=("amazonlinux:2" -"centos:7" +declare -a matrix_images=("centos:7" "centos:8" "fedora:33" "fedora:34" diff --git a/scripts/ci.sh b/scripts/ci.sh index 9f68de07b..2bd6d7cf5 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -14,8 +14,7 @@ elif [ `uname -m` = "arm64" ]; then docker buildx create --use fi -declare -a matrix_images=("amazonlinux:2" -"centos:7" +declare -a matrix_images=("centos:7" "centos:8" "fedora:33" "fedora:34" diff --git a/scripts/provision/amazonlinux_2.sh b/scripts/provision/amazonlinux_2.sh deleted file mode 100755 index 3a861d147..000000000 --- a/scripts/provision/amazonlinux_2.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -set -xe - -# Install prerequisites -# yum install -y \ -# openssl \ -# net-tools \ -# postgresql-server \ -# systemd \ -# iptables -# postgresql-setup initdb -# systemctl restart postgresql -# -# # Install WireGuard -# curl -L -o /etc/yum.repos.d/wireguard.repo https://copr.fedorainfracloud.org/coprs/jdoss/wireguard/repo/epel-7/jdoss-wireguard-epel-7.repo -# yum install -y wireguard-dkms wireguard-tools -# -# rpm -ivh /tmp/firezone*.rpm -# service firezone start