diff --git a/.travis.yml b/.travis.yml index 7aa4d1c38..e61242670 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,13 +5,16 @@ python: - '3.6' - '3.7' env: - - HVAC_VAULT_VERSION=0.11.0 # This ver kept explicitly; it has subsequently reverted backwards-incompatible changes. - - HVAC_VAULT_VERSION=1.0.3 - - HVAC_VAULT_VERSION=1.1.3 - - HVAC_VAULT_VERSION=HEAD + - HVAC_VAULT_VERSION=0.11.0 HVAC_VAULT_LICENSE=enterprise # This ver kept explicitly; it has subsequently reverted backwards-incompatible changes. + - HVAC_VAULT_VERSION=1.0.3 HVAC_VAULT_LICENSE=enterprise + - HVAC_VAULT_VERSION=1.1.3 HVAC_VAULT_LICENSE=enterprise + - HVAC_VAULT_VERSION=HEAD HVAC_VAULT_LICENSE=OSS - TOXENV=flake8 matrix: include: + - name: 'Vault OSS - Latest hvac-tested Release on Python 3.7' + python: '3.7' + env: HVAC_VAULT_VERSION=1.1.3 HVAC_VAULT_LICENSE=OSS - name: 'Test Documentation Build - Sphinx: "make html"' env: TOXENV=docs allow_failures: @@ -21,7 +24,7 @@ matrix: fast_finish: true install: # - tests/scripts/install-consul.sh - - tests/scripts/install-vault.sh ${HVAC_VAULT_VERSION} + - tests/scripts/install-vault.sh ${HVAC_VAULT_VERSION} ${HVAC_VAULT_LICENSE} - pip install tox-travis script: - make test diff --git a/tests/scripts/install-vault.sh b/tests/scripts/install-vault.sh index 09ff6343d..8da001055 100755 --- a/tests/scripts/install-vault.sh +++ b/tests/scripts/install-vault.sh @@ -2,7 +2,9 @@ set -eux DEFAULT_VAULT_VERSION=1.1.3 +DEFAULT_VAULT_LICENSE=oss HVAC_VAULT_VERSION=${1:-$DEFAULT_VAULT_VERSION} +HVAC_VAULT_LICENSE=${2:-DEFAULT_VAULT_LICENSE} function build_and_install_vault_head_ref() { mkdir -p $HOME/bin @@ -28,11 +30,13 @@ function install_vault_release() { mkdir -p $HOME/bin cd /tmp - - #curl -sOL https://releases.hashicorp.com/vault/${HVAC_VAULT_VERSION}/vault_${HVAC_VAULT_VERSION}_linux_amd64.zip - #unzip vault_${HVAC_VAULT_VERSION}_linux_amd64.zip - curl -sOL https://s3-us-west-2.amazonaws.com/hc-enterprise-binaries/vault/ent/${HVAC_VAULT_VERSION}/vault-enterprise_${HVAC_VAULT_VERSION}%2Bent_linux_amd64.zip - unzip vault-enterprise_${HVAC_VAULT_VERSION}%2Bent_linux_amd64.zip + if [[ "$HVAC_VAULT_LICENSE" == "oss" ]]; then + curl -sOL https://releases.hashicorp.com/vault/${HVAC_VAULT_VERSION}/vault_${HVAC_VAULT_VERSION}_linux_amd64.zip + unzip vault_${HVAC_VAULT_VERSION}_linux_amd64.zip + else + curl -sOL https://s3-us-west-2.amazonaws.com/hc-enterprise-binaries/vault/ent/${HVAC_VAULT_VERSION}/vault-enterprise_${HVAC_VAULT_VERSION}%2Bent_linux_amd64.zip + unzip vault-enterprise_${HVAC_VAULT_VERSION}%2Bent_linux_amd64.zip + fi mv vault $HOME/bin }