From d0b08f1c50b0b4106c0ae5f398912aab596a447a Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 22 Jan 2018 09:59:55 +0100
Subject: Add GitLab Runner service to GitLab QA

---
 qa/qa.rb                  |  9 ++++++---
 qa/qa/service/omnibus.rb  | 20 ++++++++++++++++++++
 qa/qa/service/runner.rb   | 28 ++++++++++++++++++++++++++++
 qa/qa/service/shellout.rb | 23 +++++++++++++++++++++++
 qa/qa/shell/omnibus.rb    | 39 ---------------------------------------
 5 files changed, 77 insertions(+), 42 deletions(-)
 create mode 100644 qa/qa/service/omnibus.rb
 create mode 100644 qa/qa/service/runner.rb
 create mode 100644 qa/qa/service/shellout.rb
 delete mode 100644 qa/qa/shell/omnibus.rb

(limited to 'qa')

diff --git a/qa/qa.rb b/qa/qa.rb
index 4803432aeee..5c277b95517 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -126,10 +126,13 @@ module QA
   end
 
   ##
-  # Classes describing shell interaction with GitLab
+  # Classes describing services being part of GitLab and how we can interact
+  # with these services, like through the shell.
   #
-  module Shell
-    autoload :Omnibus, 'qa/shell/omnibus'
+  module Service
+    autoload :Shellable, 'qa/service/shellable'
+    autoload :Omnibus, 'qa/service/omnibus'
+    autoload :Runner, 'qa/service/runner'
   end
 
   ##
diff --git a/qa/qa/service/omnibus.rb b/qa/qa/service/omnibus.rb
new file mode 100644
index 00000000000..b5c06874e5c
--- /dev/null
+++ b/qa/qa/service/omnibus.rb
@@ -0,0 +1,20 @@
+module QA
+  module Service
+    class Omnibus
+      include Scenario::Actable
+      include Service::Shellout
+
+      def initialize(container)
+        @name = container
+      end
+
+      def gitlab_ctl(command, input: nil)
+        if input.nil?
+          shell "docker exec #{@name} gitlab-ctl #{command}"
+        else
+          shell "docker exec #{@name} bash -c '#{input} | gitlab-ctl #{command}'"
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/service/runner.rb b/qa/qa/service/runner.rb
new file mode 100644
index 00000000000..a6a60f53787
--- /dev/null
+++ b/qa/qa/service/runner.rb
@@ -0,0 +1,28 @@
+module QA
+  module Service
+    class Runner
+      include Scenario::Actable
+      include Service::Shellout
+
+      def initialize(image)
+        @image = image
+      end
+
+      def pull
+        shell "docker pull #{@image}"
+      end
+
+      def register(token)
+        raise NotImplementedError
+      end
+
+      def run
+        raise NotImplementedError
+      end
+
+      def remove
+        raise NotImplementedError
+      end
+    end
+  end
+end
diff --git a/qa/qa/service/shellout.rb b/qa/qa/service/shellout.rb
new file mode 100644
index 00000000000..898febde63c
--- /dev/null
+++ b/qa/qa/service/shellout.rb
@@ -0,0 +1,23 @@
+require 'open3'
+
+module QA
+  module Service
+    module Shellout
+      ##
+      # TODO, make it possible to use generic QA framework classes
+      # as a library - gitlab-org/gitlab-qa#94
+      #
+      def shell(command)
+        puts "Executing `#{command}`"
+
+        Open3.popen2e(command) do |_in, out, wait|
+          out.each { |line| puts line }
+
+          if wait.value.exited? && wait.value.exitstatus.nonzero?
+            raise "Command `#{command}` failed!"
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/shell/omnibus.rb b/qa/qa/shell/omnibus.rb
deleted file mode 100644
index 6b3628d3109..00000000000
--- a/qa/qa/shell/omnibus.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'open3'
-
-module QA
-  module Shell
-    class Omnibus
-      include Scenario::Actable
-
-      def initialize(container)
-        @name = container
-      end
-
-      def gitlab_ctl(command, input: nil)
-        if input.nil?
-          shell "docker exec #{@name} gitlab-ctl #{command}"
-        else
-          shell "docker exec #{@name} bash -c '#{input} | gitlab-ctl #{command}'"
-        end
-      end
-
-      private
-
-      ##
-      # TODO, make it possible to use generic QA framework classes
-      # as a library - gitlab-org/gitlab-qa#94
-      #
-      def shell(command)
-        puts "Executing `#{command}`"
-
-        Open3.popen2e(command) do |_in, out, wait|
-          out.each { |line| puts line }
-
-          if wait.value.exited? && wait.value.exitstatus.nonzero?
-            raise "Docker command `#{command}` failed!"
-          end
-        end
-      end
-    end
-  end
-end
-- 
cgit v1.2.3