From 40366dd10bef5d85786ab7baa9d813b33d52884b Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Fri, 27 Apr 2018 16:33:38 +0800
Subject: Fix rubocop offense and enable jobs for qa

We could revisit which we don't want to run in qa.
---
 .gitlab-ci.yml                   | 2 +-
 qa/qa/factory/repository/push.rb | 4 +++-
 qa/qa/runtime/key/ecdsa.rb       | 1 +
 qa/qa/runtime/key/ed25519.rb     | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5bc2f1f3a0f..bb55758ba6f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,7 +110,7 @@ stages:
 # Jobs that only need to pull cache
 .dedicated-no-docs-pull-cache-job: &dedicated-no-docs-pull-cache-job
   <<: *dedicated-runner
-  <<: *except-docs-and-qa
+  <<: *except-docs
   <<: *pull-cache
   dependencies:
     - setup-test-env
diff --git a/qa/qa/factory/repository/push.rb b/qa/qa/factory/repository/push.rb
index 01a9d0428ea..795f1f9cb1a 100644
--- a/qa/qa/factory/repository/push.rb
+++ b/qa/qa/factory/repository/push.rb
@@ -3,7 +3,9 @@ module QA
     module Repository
       class Push < Factory::Base
         attr_accessor :file_name, :file_content, :commit_message,
-                      :branch_name, :new_branch, :remote_branch
+                      :branch_name, :new_branch
+
+        attr_writer :remote_branch
 
         dependency Factory::Resource::Project, as: :project do |project|
           project.name = 'project-with-code'
diff --git a/qa/qa/runtime/key/ecdsa.rb b/qa/qa/runtime/key/ecdsa.rb
index 71238e4352a..20adad45913 100644
--- a/qa/qa/runtime/key/ecdsa.rb
+++ b/qa/qa/runtime/key/ecdsa.rb
@@ -1,3 +1,4 @@
+# rubocop:disable Naming/FileName
 module QA
   module Runtime
     module Key
diff --git a/qa/qa/runtime/key/ed25519.rb b/qa/qa/runtime/key/ed25519.rb
index bd2f2522447..63865c1cee5 100644
--- a/qa/qa/runtime/key/ed25519.rb
+++ b/qa/qa/runtime/key/ed25519.rb
@@ -1,3 +1,4 @@
+# rubocop:disable Naming/FileName
 module QA
   module Runtime
     module Key
-- 
cgit v1.2.3