sambot 0.1.145 → 0.1.146

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a19d727a4fd4596073f9929e822078694d8631ea
-  data.tar.gz: ff54b2494b3ae0befa21296d45f19da0d1abaa72
+  metadata.gz: e8f2ec262f4ed7ffd2912db88012f7fbb52d0f7e
+  data.tar.gz: c1cffa26f5b08936fd2cde757a83ef7dd01bd0c8
 SHA512:
-  metadata.gz: 842e59c20d9bb51ce94096e4e70eb4a9617747a69da6bcf5a8fd9fbf59428c5861b623e982eeca1e3d75497d14df3b44bdb720d3b0ee75eac8ba958779723f08
-  data.tar.gz: aed86a230d13ae163777be8c9dbfdf2e3d09d15319a1797362d1e9036af89bda01153d26e7feb3159851c728dbcd7807b7b905e9e0d36a2ff7d1c005de7c3319
+  metadata.gz: 3669d2c5e66fd52764966575d53ba86c55c9d0742df0fbe84469b7daf2d402e4c3b7f9e17862288596173ab0ac55a3a12cd3a086cfcca60ed47b2dc73aca1933
+  data.tar.gz: 202dd3ebc057c8ba1db00af7af85f71c1d010fd7f6d8a906d917adca1322f00a891512d68c4099cf5aa14946ca0f4168f7a6a050ee1ff9e399a750f633e5a1e2

data/lib/sambot/templates/local_bootstrap.sh

@@ -1,8 +1,24 @@
 #!/bin/bash -e
+
+export VAULT_ADDR=http://192.168.255.5:8200
+export VAULT_TOKEN=root
+
 sudo yum install -y unzip
-curl -O "https://releases.hashicorp.com/vault/0.6.5/vault_0.6.5_linux_amd64.zip"
+wget "https://releases.hashicorp.com/vault/0.6.5/vault_0.6.5_linux_amd64.zip"
 unzip vault_0.6.5_linux_amd64.zip -d /usr/bin
-nohup vault server -dev -dev-root-token-id="root" < /dev/null &> /tmp/vault.log &
-export VAULT_ADDR=http://127.0.0.1:8200
-mkdir /etc/vault
-echo '{ "vault-addr": "http://127.0.0.1:8200", "access": "root"}' > /etc/vault/tokens.json
+sudo mkdir /etc/vault
+
+token=$(vault token-create -policy=nightswatch-ro -role=nightswatch-ro -wrap-ttl=72h | awk '/^wrapping_token:/ {print $2}')
+cat << EOF > /etc/vault/tokens.json
+{
+    "vault-addr": "${VAULT_ADDR}",
+    "skip-verify": true,
+    "wrapped": "${token}",
+    "access": ""
+}
+EOF
+
+sudo mkdir -p /opt/as-vault-tool/1.0.2
+wget https://storage.googleapis.com/ads-devops-chef/as-vault-tool/1.0.2/linux_amd64.zip
+sudo unzip linux_amd64 -d /opt/as-vault-tool/1.0.2/
+sudo /opt/as-vault-tool/1.0.2/as-vault-tool tokenrenew

data/lib/sambot/templates/teamcity.sh.erb

@@ -20,10 +20,11 @@ set +e
 <% else %>
 <% unless ENV['SKIP_TESTING_AS_EMERGENCY'] %>
   chef exec kitchen create <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
-  sleep 60
-  chef exec kitchen test <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
+  sleep 45
+  chef exec kitchen verify <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
   RETVAL=$?
   if [ $RETVAL -eq 0 ] ; then
+    chef exec kitchen destroy <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
     echo "Test Kitchen converged and all tests passed - Ready to upload to server"
     exit $RETVAL
   elif [ $RETVAL -ne 0 ] ; then

data/lib/sambot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sambot
-  VERSION = '0.1.145'.freeze
+  VERSION = '0.1.146'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.145
+  version: 0.1.146
 platform: ruby
 authors:
 - Olivier Kouame