vagrant-openshift 3.0.8 → 3.0.9

data/lib/vagrant-openshift/command/install_docker.rb

@@ -0,0 +1,68 @@
+#--
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+require_relative "../action"
+
+module Vagrant
+  module Openshift
+    module Commands
+      class InstallDocker < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "install docker"
+        end
+
+        def execute
+          options = {}
+          options[:"docker.repourls"] = []
+          options[:"docker.reponames"] = []
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant install-docker [vm-name]"
+            o.separator ""
+
+            o.on("--repourl [name]", String, "URL of a repository file to use when installing Docker.") do |f|
+              options[:"docker.repourls"] << f
+            end
+
+            o.on("--repo [name]", String, "Name of a repository to enable when installing Docker. Defaults to use all available repositories.") do |f|
+              options[:"docker.reponames"] << f
+            end
+
+            o.on("--docker.version [version]", String, "Install the specified Docker version. Leave empty to install latest available.") do |f|
+              options[:"docker.version"] = f
+            end
+
+            o.on("--force", String, "Uninstall Docker to swap in the new version, even if the uninstall is unclean.") do |f|
+              options[:force] = true
+            end
+
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv, :reverse => true) do |machine|
+            actions = Vagrant::Openshift::Action.install_docker(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openshift/command/install_golang.rb

@@ -0,0 +1,68 @@
+#--
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+require_relative "../action"
+
+module Vagrant
+  module Openshift
+    module Commands
+      class InstallGolang < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "install golang"
+        end
+
+        def execute
+          options = {}
+          options[:"golang.repourls"] = []
+          options[:"golang.reponames"] = []
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant install-golang [vm-name]"
+            o.separator ""
+
+            o.on("--repourl [name]", String, "URL of a repository file to use when installing Golang.") do |f|
+              options[:"golang.repourls"] << f
+            end
+
+            o.on("--repo [name]", String, "Name of a repository to enable when installing Golang. Defaults to use all available repositories.") do |f|
+              options[:"golang.reponames"] << f
+            end
+
+            o.on("--golang.version [version]", String, "Install the specified Golang version. Leave empty to install latest available.") do |f|
+              options[:"golang.version"] = f
+            end
+
+            o.on("--force", String, "Uninstall Golang to swap in the new version, even if the uninstall is unclean.") do |f|
+              options[:force] = true
+            end
+
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv, :reverse => true) do |machine|
+            actions = Vagrant::Openshift::Action.install_golang(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openshift/command/repo_sync_customer_diagnostics.rb

@@ -0,0 +1,71 @@
+#--
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+require_relative "../action"
+
+module Vagrant
+  module Openshift
+    module Commands
+      class RepoSyncCustomerDiagnostics < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "syncs your local repos to the current instance"
+        end
+
+        def execute
+          options = {}
+          options[:images] = true
+          options[:build] = true
+          options[:clean] = false
+          options[:source] = false
+          options[:repo] = 'openshift-ansible'
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant sync-customer-diagnostics [vm-name]"
+            o.separator ""
+
+            o.on("-s", "--source", "Sync the source (not required if using synced folders)") do |f|
+              options[:source] = f
+            end
+
+            o.on("-c", "--clean", "Delete existing repo before syncing source") do |f|
+              options[:clean] = f
+            end
+
+            o.on("--dont-install", "Don't build and install updated source") do |f|
+              options[:build] = false
+            end
+
+            o.on("--no-images", "Don't build updated component Docker images") do |f|
+              options[:images] = false
+            end
+
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv, :reverse => true) do |machine|
+            actions = Vagrant::Openshift::Action.repo_sync_customer_diagnostics(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openshift/command/repo_sync_origin_metrics.rb

@@ -0,0 +1,71 @@
+#--
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+require_relative "../action"
+
+module Vagrant
+  module Openshift
+    module Commands
+      class RepoSyncOriginMetrics < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "syncs your local repos to the current instance"
+        end
+
+        def execute
+          options = {}
+          options[:images] = true
+          options[:build] = true
+          options[:clean] = false
+          options[:source] = false
+          options[:repo] = 'origin-metrics'
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant sync-origin-metrics [vm-name]"
+            o.separator ""
+
+            o.on("-s", "--source", "Sync the source (not required if using synced folders)") do |f|
+              options[:source] = f
+            end
+
+            o.on("-c", "--clean", "Delete existing repo before syncing source") do |f|
+              options[:clean] = f
+            end
+
+            o.on("--dont-install", "Don't build and install updated source") do |f|
+              options[:build] = false
+            end
+
+            o.on("--no-images", "Don't build updated component Docker images") do |f|
+              options[:images] = false
+            end
+
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv, :reverse => true) do |machine|
+            actions = Vagrant::Openshift::Action.repo_sync_origin_metrics(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openshift/command/test_customer_diagnostics.rb

@@ -0,0 +1,69 @@
+#--
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+require_relative "../action"
+
+module Vagrant
+  module Openshift
+    module Commands
+      class TestCustomerDiagnostics < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "run the customer diagnostics tests"
+        end
+
+        def execute
+          options = {}
+          options[:download] = false
+          options[:target] = 'test-integration'
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant test-customer-diagnostics [machine-name]"
+            o.separator ""
+
+            o.on("", "--root", String, "Run tests as root") do |f|
+              options[:root] = true
+            end
+
+            o.on("-d","--artifacts", String, "Download logs") do |f|
+              options[:download] = true
+            end
+
+            o.on("", "--env ENV=VALUE", String, "Environment variable to execute tests with") do |f|
+              options[:envs] = [] unless options[:envs]
+              options[:envs] << f
+            end
+
+            o.on("-t", "--target MAKEFILE_TARGETS", String, "Arguments to pass to the repository Makefile") do |f|
+              options[:target] = f
+            end
+
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv, :reverse => true) do |machine|
+            actions = Vagrant::Openshift::Action.run_customer_diagnostics_tests(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openshift/command/test_origin_image.rb

@@ -132,7 +132,7 @@ if [ "#{base_images}" == "true" -a -n "#{registry}" ]; then
   docker pull #{registry}/openshift/base-rhel7 && docker tag #{registry}/openshift/base-rhel7 openshift/base-rhel7
 fi
 
-if ! sudo env "PATH=$PATH" SKIP_SQUASH=1 make test TARGET=rhel7; then
+if ! sudo env "PATH=$PATH" SKIP_SQUASH=1 SKIP_RHEL_SCL=1 make test TARGET=rhel7; then
     echo "ERROR: #{image}-rhel7 failed testing."
     exit 1
 fi

data/lib/vagrant-openshift/command/test_origin_metrics.rb

@@ -0,0 +1,67 @@
+#--
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+require_relative "../action"
+
+module Vagrant
+  module Openshift
+    module Commands
+      class TestOriginMetrics < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "run the origin-metrics tests"
+        end
+
+        def execute
+          options = {}
+          options[:download] = false
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant test-origin-metrics [machine-name]"
+            o.separator ""
+
+            o.on("", "--root", String, "Run tests as root") do |f|
+              options[:root] = true
+            end
+
+            o.on("-d","--artifacts", String, "Download logs") do |f|
+              options[:download] = true
+            end
+
+            o.on("-r","--image-registry", String, "Image registry to configure tests with") do |f|
+              options[:image_registry] = f
+            end
+
+            o.on("", "--env ENV=VALUE", String, "Environment variable to execute tests with") do |f|
+              options[:envs] = [] unless options[:envs]
+              options[:envs] << f
+            end
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv, :reverse => true) do |machine|
+            actions = Vagrant::Openshift::Action.run_origin_metrics_tests(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openshift/constants.rb

@@ -31,7 +31,7 @@ module Vagrant
         {
           'origin' => 'https://github.com/openshift/origin.git',
           'source-to-image' => 'https://github.com/openshift/source-to-image.git',
-          'origin-web-console' => 'https://github.com/openshift/origin-web-console.git'          
+          'origin-web-console' => 'https://github.com/openshift/origin-web-console.git'
         }
       end
 
@@ -52,7 +52,13 @@ module Vagrant
           'origin' => openshift_repos,
           nil => openshift_repos,
           'origin-console' => console_repos,
-          'origin-aggregated-logging' => aggregated_logging_repos
+          'origin-aggregated-logging' => aggregated_logging_repos,
+          'origin-metrics' => {
+            'origin-metrics' => 'https://github.com/openshift/origin-metrics.git'
+          },
+          'openshift-ansible' => {
+            'openshift-ansible' => 'https://github.com/openshift/openshift-ansible.git'
+          }
         }[reponame]
       end