From 600186dbac0e035d39ed129c87db30cdbd3ee130 Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Sun, 15 Mar 2020 11:01:55 +0100 Subject: [PATCH] ci: bump consul and vault Signed-off-by: Yoan Blanc --- .circleci/config.yml | 72 ++++++++++---------- .circleci/config/commands/install-consul.yml | 2 +- .circleci/config/commands/install-vault.yml | 2 +- demo/vagrant/Vagrantfile | 2 +- scripts/vagrant-linux-priv-consul.sh | 2 +- 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9162547e2..73816ff9a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,16 +37,16 @@ jobs: name: install protoc - run: command: | - wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.1/consul_1.6.1_linux_amd64.zip + wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.4/consul_1.6.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/consul.zip rm -rf /tmp/consul* - name: Install Consul 1.6.1 + name: Install Consul 1.6.4 - run: command: | - wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.3/vault_1.2.3_linux_amd64.zip + wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.4/vault_1.2.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/vault.zip rm -rf /tmp/vault* - name: Install Vault 1.2.3 + name: Install Vault 1.2.4 - run: command: | if [ ! -z $GOTESTARCH ] && [ $GOTESTARCH == "386" ]; then @@ -113,16 +113,16 @@ jobs: name: install protoc - run: command: | - wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.1/consul_1.6.1_linux_amd64.zip + wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.4/consul_1.6.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/consul.zip rm -rf /tmp/consul* - name: Install Consul 1.6.1 + name: Install Consul 1.6.4 - run: command: | - wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.3/vault_1.2.3_linux_amd64.zip + wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.4/vault_1.2.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/vault.zip rm -rf /tmp/vault* - name: Install Vault 1.2.3 + name: Install Vault 1.2.4 - run: command: | if [ ! -z $GOTESTARCH ] && [ $GOTESTARCH == "386" ]; then @@ -189,16 +189,16 @@ jobs: name: install protoc - run: command: | - wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.1/consul_1.6.1_linux_amd64.zip + wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.4/consul_1.6.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/consul.zip rm -rf /tmp/consul* - name: Install Consul 1.6.1 + name: Install Consul 1.6.4 - run: command: | - wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.3/vault_1.2.3_linux_amd64.zip + wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.4/vault_1.2.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/vault.zip rm -rf /tmp/vault* - name: Install Vault 1.2.3 + name: Install Vault 1.2.4 - run: command: | if [ ! -z $GOTESTARCH ] && [ $GOTESTARCH == "386" ]; then @@ -265,16 +265,16 @@ jobs: name: install protoc - run: command: | - wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.1/consul_1.6.1_linux_amd64.zip + wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.4/consul_1.6.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/consul.zip rm -rf /tmp/consul* - name: Install Consul 1.6.1 + name: Install Consul 1.6.4 - run: command: | - wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.3/vault_1.2.3_linux_amd64.zip + wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.4/vault_1.2.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/vault.zip rm -rf /tmp/vault* - name: Install Vault 1.2.3 + name: Install Vault 1.2.4 - run: command: | if [ ! -z $GOTESTARCH ] && [ $GOTESTARCH == "386" ]; then @@ -341,16 +341,16 @@ jobs: name: install protoc - run: command: | - wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.1/consul_1.6.1_linux_amd64.zip + wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.4/consul_1.6.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/consul.zip rm -rf /tmp/consul* - name: Install Consul 1.6.1 + name: Install Consul 1.6.4 - run: command: | - wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.3/vault_1.2.3_linux_amd64.zip + wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.4/vault_1.2.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/vault.zip rm -rf /tmp/vault* - name: Install Vault 1.2.3 + name: Install Vault 1.2.4 - run: command: | if [ ! -z $GOTESTARCH ] && [ $GOTESTARCH == "386" ]; then @@ -503,16 +503,16 @@ jobs: name: install protoc - run: command: | - wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.1/consul_1.6.1_linux_amd64.zip + wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.4/consul_1.6.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/consul.zip rm -rf /tmp/consul* - name: Install Consul 1.6.1 + name: Install Consul 1.6.4 - run: command: | - wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.3/vault_1.2.3_linux_amd64.zip + wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.4/vault_1.2.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/vault.zip rm -rf /tmp/vault* - name: Install Vault 1.2.3 + name: Install Vault 1.2.4 - run: command: | if [ ! -z $GOTESTARCH ] && [ $GOTESTARCH == "386" ]; then @@ -573,16 +573,16 @@ jobs: name: install protoc - run: command: | - wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.1/consul_1.6.1_linux_amd64.zip + wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.4/consul_1.6.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/consul.zip rm -rf /tmp/consul* - name: Install Consul 1.6.1 + name: Install Consul 1.6.4 - run: command: | - wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.3/vault_1.2.3_linux_amd64.zip + wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.4/vault_1.2.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/vault.zip rm -rf /tmp/vault* - name: Install Vault 1.2.3 + name: Install Vault 1.2.4 - run: command: | if [ -z $GOTEST_PKGS_EXCLUDE ]; @@ -638,16 +638,16 @@ jobs: name: install protoc - run: command: | - wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.1/consul_1.6.1_linux_amd64.zip + wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.4/consul_1.6.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/consul.zip rm -rf /tmp/consul* - name: Install Consul 1.6.1 + name: Install Consul 1.6.4 - run: command: | - wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.3/vault_1.2.3_linux_amd64.zip + wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.4/vault_1.2.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/vault.zip rm -rf /tmp/vault* - name: Install Vault 1.2.3 + name: Install Vault 1.2.4 - run: command: | if [ ! -z $GOTESTARCH ] && [ $GOTESTARCH == "386" ]; then @@ -774,16 +774,16 @@ jobs: name: install protoc - run: command: | - wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.1/consul_1.6.1_linux_amd64.zip + wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/1.6.4/consul_1.6.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/consul.zip rm -rf /tmp/consul* - name: Install Consul 1.6.1 + name: Install Consul 1.6.4 - run: command: | - wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.3/vault_1.2.3_linux_amd64.zip + wget -q -O /tmp/vault.zip https://releases.hashicorp.com/vault/1.2.4/vault_1.2.4_linux_amd64.zip sudo unzip -d /usr/local/bin /tmp/vault.zip rm -rf /tmp/vault* - name: Install Vault 1.2.3 + name: Install Vault 1.2.4 - run: command: | if [ ! -z $GOTESTARCH ] && [ $GOTESTARCH == "386" ]; then diff --git a/.circleci/config/commands/install-consul.yml b/.circleci/config/commands/install-consul.yml index 75aeb3b81..d9026659b 100644 --- a/.circleci/config/commands/install-consul.yml +++ b/.circleci/config/commands/install-consul.yml @@ -1,7 +1,7 @@ parameters: version: type: string - default: 1.6.1 + default: 1.6.4 steps: - run: name: Install Consul << parameters.version >> diff --git a/.circleci/config/commands/install-vault.yml b/.circleci/config/commands/install-vault.yml index 3e52cbee2..74e1864b3 100644 --- a/.circleci/config/commands/install-vault.yml +++ b/.circleci/config/commands/install-vault.yml @@ -1,7 +1,7 @@ parameters: version: type: string - default: 1.2.3 + default: 1.2.4 steps: - run: name: Install Vault << parameters.version >> diff --git a/demo/vagrant/Vagrantfile b/demo/vagrant/Vagrantfile index 55a4ae691..ebabb77ab 100644 --- a/demo/vagrant/Vagrantfile +++ b/demo/vagrant/Vagrantfile @@ -35,7 +35,7 @@ sudo chmod a+w /etc/nomad.d echo "Installing Consul..." -CONSUL_VERSION=1.6.1 +CONSUL_VERSION=1.6.4 curl -sSL https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip > consul.zip unzip /tmp/consul.zip sudo install consul /usr/bin/consul diff --git a/scripts/vagrant-linux-priv-consul.sh b/scripts/vagrant-linux-priv-consul.sh index b6b62e7bc..e2c8e523c 100755 --- a/scripts/vagrant-linux-priv-consul.sh +++ b/scripts/vagrant-linux-priv-consul.sh @@ -2,7 +2,7 @@ set -o errexit -VERSION="1.6.1" +VERSION="1.6.4" DOWNLOAD=https://releases.hashicorp.com/consul/${VERSION}/consul_${VERSION}_linux_amd64.zip function install_consul() {