mixlib-install 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6521f3678f0d1b61776fd15ed97211bb9a218ba4
-  data.tar.gz: ff8d551119e27d84087e4b69c129a0aab47bfff5
+  metadata.gz: 3fd429858c205b8c5d6bf643428cd3f56c7098a0
+  data.tar.gz: 3135db39f1a26f22c6bc0f5b36ecb26353fc1489
 SHA512:
-  metadata.gz: 0e897cdb1dd20f149d2c6949a8df21b974baea1baf837cc76ed540530c11d199dbaf22998b05a3b7ed5da58799a32fa584ecb3dd08db5e4ac7a8454f79a6d84e
-  data.tar.gz: 9c8c72d0d7fa09dea9e64ff6524758af09fd41238080b8afcf7f190ee0c4eaf1af973754b5ba72c4232bdf5354872a1eac54e58ca3c58974836fbfa583459f22
+  metadata.gz: c967072c4b5a6059cebe0eabcc29de03f6b6c677a8d180f867043fcf7e391feeb1a61c61e9e268a2f9eb704a7be408c1a14494e717e6fc122f1d098fae087e3d
+  data.tar.gz: 471805ae5fadac8f184902550cd01b2a543fb4a36a9e7a8e3067a8a3eded34152c219825dade8e09bbbdf94061d070517310ce337a4632769113708b2fa5b94f

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [2.0.2]
+- Fix install.sh to include fetch_package.sh
+
 ## [2.0.1]
 - Fix install.sh and install.ps1 scripts to install unstable packages
 

data/acceptance/ubuntu_install_command/.acceptance/acceptance-cookbook/recipes/provision.rb

@@ -0,0 +1,11 @@
+execute "bundle exec ruby -e \"require 'mixlib/install'; puts Mixlib::Install.new(product_name: 'omnibus-toolchain', product_version: :latest, channel: :stable).install_command\" > ../.acceptance_data/install.sh" do
+  cwd node['chef-acceptance']['suite-dir']
+end
+
+execute "terraform plan" do
+  cwd "#{node['chef-acceptance']['suite-dir']}/terraform"
+end
+
+execute "terraform apply" do
+  cwd "#{node['chef-acceptance']['suite-dir']}/terraform"
+end

data/acceptance/ubuntu_install_command/inspec/verify.rb

@@ -0,0 +1,3 @@
+describe package("omnibus-toolchain") do
+  it { should be_installed }
+end

data/acceptance/ubuntu_install_sh/.acceptance/acceptance-cookbook/.gitignore

@@ -0,0 +1,8 @@
+nodes/
+tmp/
+
+# Terraform
+*.tfstate
+*.tfstate.backup
+*_override.tf
+

data/acceptance/ubuntu_install_sh/.acceptance/acceptance-cookbook/metadata.rb

@@ -0,0 +1,2 @@
+name 'acceptance-cookbook'
+

data/acceptance/ubuntu_install_sh/.acceptance/acceptance-cookbook/recipes/destroy.rb

@@ -0,0 +1,3 @@
+execute "terraform destroy -force" do
+  cwd "#{node['chef-acceptance']['suite-dir']}/terraform"
+end

data/acceptance/ubuntu_install_sh/.acceptance/acceptance-cookbook/recipes/verify.rb

@@ -0,0 +1,11 @@
+ruby_block "get ip" do
+  block do
+    tf_state = JSON.parse(File.read("#{node['chef-acceptance']['suite-dir']}/terraform/terraform.tfstate"))
+    node.default["ip"] = tf_state["modules"].first["resources"]["aws_instance.mixlib_install_sh"]["primary"]["attributes"]["public_ip"]
+  end
+end
+
+execute "run inspec" do
+  command lazy { "inspec exec verify.rb -t ssh://ubuntu@#{node['ip']} -i ~/.ssh/es-infrastructure.pem" }
+  cwd "#{node['chef-acceptance']['suite-dir']}/inspec"
+end

data/acceptance/ubuntu_install_sh/terraform/application.tf

@@ -0,0 +1,78 @@
+data "aws_ami" "ubuntu_14_ami" {
+  most_recent = true
+
+  filter {
+    name   = "owner-id"
+    values = ["099720109477"]
+  }
+
+  filter {
+    name   = "name"
+    values = ["ubuntu/images/*/ubuntu-*-14.04-*-server-*"]
+  }
+
+  filter {
+    name   = "architecture"
+    values = ["x86_64"]
+  }
+
+  filter {
+    name   = "virtualization-type"
+    values = ["hvm"]
+  }
+
+  filter {
+    name   = "block-device-mapping.volume-type"
+    values = ["gp2"]
+  }
+
+  filter {
+    name   = "image-type"
+    values = ["machine"]
+  }
+}
+
+resource "aws_instance" "mixlib_install_sh" {
+  count = 1
+
+  ami           = "${data.aws_ami.ubuntu_14_ami.id}"
+  instance_type = "${var.aws_instance_type}"
+  key_name      = "es-infrastructure"
+
+  associate_public_ip_address = true
+
+  subnet_id         = "subnet-11ac0174" # Planet Releng Public Subnet
+  source_dest_check = false
+
+  vpc_security_group_ids = [
+    "sg-96274af3",
+  ]
+
+  connection {
+    user        = "ubuntu"
+    private_key = "${file("${var.connection_private_key}")}"
+    agent       = "${var.connection_agent}"
+    timeout  = "10m"
+  }
+
+  tags {
+    # ChefOps's AWS standard tags:
+    X-Dept        = "EngServ"
+    X-Contact     = "pwright"
+    X-Production  = "false"
+    X-Environment = "development"
+    X-Application = "mixlib-install"
+  }
+
+  provisioner "file" {
+    source      = "../../.acceptance_data/install.sh"
+    destination = "/tmp/install.sh"
+  }
+
+  provisioner "remote-exec" {
+    inline = [
+      "chmod +x /tmp/install.sh",
+      "sudo bash /tmp/install.sh",
+    ]
+  }
+}

data/acceptance/ubuntu_install_sh/terraform/aws.tf

@@ -0,0 +1,8 @@
+# Restrict operation of terraform to chef-es profile so that
+# we do not create resources in other aws profiles.
+# We assume user has configured standard aws credentials
+# under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
+provider "aws" {
+  region  = "${var.aws_region}"
+  profile = "chef-aws"
+}

data/acceptance/ubuntu_install_sh/terraform/variables.tf

@@ -0,0 +1,27 @@
+# Region to create infrastructure in
+variable "aws_region" {
+  type    = "string"
+  default = "us-west-2"
+}
+
+variable "aws_instance_type" {
+  type    = "string"
+  default = "t2.micro"
+}
+
+# Used to indicidate whether the environment should be treated as "prod"
+# This is mainly used for the `X-Production` AWS tag.
+variable "production" {
+  default = "false"
+}
+
+# SSH Connection info used for remote provisioning instances
+variable "connection_agent" {
+  description = "Set to false to disable using ssh-agent to authenticate"
+  default     = false
+}
+
+variable "connection_private_key" {
+  description = "File path to AWS keypair private key to provision with"
+  default     = "~/.ssh/es-infrastructure.pem"
+}

data/ci/script.sh

@@ -10,8 +10,9 @@ if [ "${TRAVIS_REPO_SLUG}" = "chef/mixlib-install" ]; then
   # setup acceptance tests
   cd acceptance && export BUNDLE_GEMFILE=$PWD/Gemfile && /opt/chefdk/embedded/bin/bundle install && export APPBUNDLER_ALLOW_RVM=true
   # run acceptances tests and force cleanup
-  # only testing bourne until issues with powershell suite resovled:
+  # only testing ubuntu until issues with powershell suite resovled:
   # 1) inspec not finding chef package once connected (not reproducible locally)
   # 2) currently no way to mask password (sensitive true) AND know what the error is if inspec fails
-  /opt/chefdk/embedded/bin/bundle exec chef-acceptance test bourne --force-destroy
+  /opt/chefdk/embedded/bin/bundle exec chef-acceptance test ubuntu_install_command --force-destroy
+  /opt/chefdk/embedded/bin/bundle exec chef-acceptance test ubuntu_install_sh --force-destroy
 fi

data/lib/mixlib/install/generator/bourne.rb

@@ -53,6 +53,7 @@ module Mixlib
           else
             install_command << get_script("fetch_metadata.sh")
           end
+          install_command << get_script("fetch_package.sh")
           install_command << get_script("install_package.sh")
 
           install_command.join("\n\n")

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "2.0.1"
+    VERSION = "2.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory
@@ -201,24 +201,33 @@ files:
 - acceptance/.gitignore
 - acceptance/Gemfile
 - acceptance/README.md
-- acceptance/bourne/.acceptance/acceptance-cookbook/.gitignore
-- acceptance/bourne/.acceptance/acceptance-cookbook/metadata.rb
-- acceptance/bourne/.acceptance/acceptance-cookbook/recipes/destroy.rb
-- acceptance/bourne/.acceptance/acceptance-cookbook/recipes/provision.rb
-- acceptance/bourne/.acceptance/acceptance-cookbook/recipes/verify.rb
-- acceptance/bourne/inspec/verify.rb
-- acceptance/bourne/terraform/application.tf
-- acceptance/bourne/terraform/aws.tf
-- acceptance/bourne/terraform/variables.tf
-- acceptance/powershell/.acceptance/acceptance-cookbook/.gitignore
-- acceptance/powershell/.acceptance/acceptance-cookbook/metadata.rb
-- acceptance/powershell/.acceptance/acceptance-cookbook/recipes/destroy.rb
-- acceptance/powershell/.acceptance/acceptance-cookbook/recipes/provision.rb
-- acceptance/powershell/.acceptance/acceptance-cookbook/recipes/verify.rb
-- acceptance/powershell/inspec/verify.rb
-- acceptance/powershell/terraform/application.tf
-- acceptance/powershell/terraform/aws.tf
-- acceptance/powershell/terraform/variables.tf
+- acceptance/powershell_install_ps1/.acceptance/acceptance-cookbook/.gitignore
+- acceptance/powershell_install_ps1/.acceptance/acceptance-cookbook/metadata.rb
+- acceptance/powershell_install_ps1/.acceptance/acceptance-cookbook/recipes/destroy.rb
+- acceptance/powershell_install_ps1/.acceptance/acceptance-cookbook/recipes/provision.rb
+- acceptance/powershell_install_ps1/.acceptance/acceptance-cookbook/recipes/verify.rb
+- acceptance/powershell_install_ps1/inspec/verify.rb
+- acceptance/powershell_install_ps1/terraform/application.tf
+- acceptance/powershell_install_ps1/terraform/aws.tf
+- acceptance/powershell_install_ps1/terraform/variables.tf
+- acceptance/ubuntu_install_command/.acceptance/acceptance-cookbook/.gitignore
+- acceptance/ubuntu_install_command/.acceptance/acceptance-cookbook/metadata.rb
+- acceptance/ubuntu_install_command/.acceptance/acceptance-cookbook/recipes/destroy.rb
+- acceptance/ubuntu_install_command/.acceptance/acceptance-cookbook/recipes/provision.rb
+- acceptance/ubuntu_install_command/.acceptance/acceptance-cookbook/recipes/verify.rb
+- acceptance/ubuntu_install_command/inspec/verify.rb
+- acceptance/ubuntu_install_command/terraform/application.tf
+- acceptance/ubuntu_install_command/terraform/aws.tf
+- acceptance/ubuntu_install_command/terraform/variables.tf
+- acceptance/ubuntu_install_sh/.acceptance/acceptance-cookbook/.gitignore
+- acceptance/ubuntu_install_sh/.acceptance/acceptance-cookbook/metadata.rb
+- acceptance/ubuntu_install_sh/.acceptance/acceptance-cookbook/recipes/destroy.rb
+- acceptance/ubuntu_install_sh/.acceptance/acceptance-cookbook/recipes/provision.rb
+- acceptance/ubuntu_install_sh/.acceptance/acceptance-cookbook/recipes/verify.rb
+- acceptance/ubuntu_install_sh/inspec/verify.rb
+- acceptance/ubuntu_install_sh/terraform/application.tf
+- acceptance/ubuntu_install_sh/terraform/aws.tf
+- acceptance/ubuntu_install_sh/terraform/variables.tf
 - ci/before-script.sh
 - ci/es-infrastructure.pem.enc
 - ci/script.sh