Switch tests to Debian

This commit is contained in:
shapiro125 2020-01-09 11:14:32 -05:00
parent eb40ade096
commit cb134a8fc1
4 changed files with 11 additions and 17 deletions

View file

@ -107,23 +107,17 @@ matrix:
include:
- <<: *tests-and-linters
- <<: *deploy-local
name: 'Ubuntu 18.04: local deployment from docker'
env: DEPLOY=docker UBUNTU_VERSION=18.04
name: 'Debian 9: local deployment from docker'
env: DEPLOY=docker DEBIAN_VERSION=stretch
- <<: *deploy-local
name: 'Ubuntu 19.04: local deployment from docker'
env: DEPLOY=docker UBUNTU_VERSION=19.04
- <<: *deploy-local
name: 'Ubuntu 19.10: local deployment from docker'
env: DEPLOY=docker UBUNTU_VERSION=19.10
name: 'Debian 10: local deployment from docker'
env: DEPLOY=docker DEBIAN_VERSION=buster
- <<: *deploy-cloudinit
name: 'Ubuntu 18.04: cloud-init deployment'
env: DEPLOY=cloud-init UBUNTU_VERSION=18.04
name: 'Debian 9: cloud-init deployment'
env: DEPLOY=cloud-init DEBIAN_VERSION=stretch
- <<: *deploy-cloudinit
name: 'Ubuntu 19.04: cloud-init deployment'
env: DEPLOY=cloud-init UBUNTU_VERSION=19.04
- <<: *deploy-cloudinit
name: 'Ubuntu 19.10: cloud-init deployment'
env: DEPLOY=cloud-init UBUNTU_VERSION=19.10
name: 'Debian 10: cloud-init deployment'
env: DEPLOY=cloud-init DEBIAN_VERSION=buster
notifications:
email: false

View file

@ -11,7 +11,7 @@ export ENDPOINT=10.0.8.100
export USERS=desktop,user1,user2
export EXTRA_VARS='install_headers=false tests=true apparmor_enabled=false local_service_ip=172.16.0.1'
export ANSIBLE_EXTRA_ARGS='--skip-tags apparmor'
export REPO_SLUG=${TRAVIS_PULL_REQUEST_SLUG:-${TRAVIS_REPO_SLUG:-trailofbits/algo}}
export REPO_SLUG=${TRAVIS_PULL_REQUEST_SLUG:-${TRAVIS_REPO_SLUG:-shapiro125/algo-debian}}
export REPO_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH:-master}}
curl -s https://raw.githubusercontent.com/${TRAVIS_PULL_REQUEST_SLUG:-${TRAVIS_REPO_SLUG}}/${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH}}/install.sh | sudo -E bash -x"

View file

@ -2,7 +2,7 @@
set -ex
DEPLOY_ARGS="provider=local server=10.0.8.100 ssh_user=ubuntu endpoint=10.0.8.100 apparmor_enabled=false ondemand_cellular=true ondemand_wifi=true ondemand_wifi_exclude=test dns_adblocking=true ssh_tunneling=true store_pki=true install_headers=false tests=true local_service_ip=172.16.0.1"
DEPLOY_ARGS="provider=local server=10.0.8.100 ssh_user=admin endpoint=10.0.8.100 apparmor_enabled=false ondemand_cellular=true ondemand_wifi=true ondemand_wifi_exclude=test dns_adblocking=true ssh_tunneling=true store_pki=true install_headers=false tests=true local_service_ip=172.16.0.1"
if [ "${DEPLOY}" == "docker" ]
then

View file

@ -19,7 +19,7 @@ systemctl restart lxd-bridge.service lxd-containers.service lxd.service
lxc profile set default raw.lxc lxc.aa_profile=unconfined
lxc profile set default security.privileged true
lxc profile show default
lxc launch ubuntu:${UBUNTU_VERSION} algo
lxc launch images:debian/${DEBIAN_VERSION}/amd64 algo
ip addr