From bdbda97ea156615d382883eaff4e55f0ab12e89b Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz@gitlab.com>
Date: Wed, 6 Sep 2017 11:37:25 +0000
Subject: Enable auto-retry in GitLab CI/CD pipeline

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 778d33fb960..b76c8f00d77 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,6 +43,7 @@ stages:
 
 # Predefined scopes
 .dedicated-runner: &dedicated-runner
+  retry: 1
   tags:
     - gitlab-org
 
-- 
cgit v1.2.3


From eac86b3e5fbea4afb4c5e0ec2fc30c4c62a663bb Mon Sep 17 00:00:00 2001
From: Jarka Kadlecova <jarka@gitlab.com>
Date: Wed, 6 Sep 2017 16:15:27 +0200
Subject: reset namespace columns in migration

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b76c8f00d77..70b0cde17ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -412,7 +412,6 @@ db:migrate:reset-mysql:
 
 .migration-paths: &migration-paths
   <<: *dedicated-runner
-  <<: *only-canonical-masters
   <<: *pull-cache
   stage: test
   variables:
-- 
cgit v1.2.3


From 86cdcfed8b66623015e27d6c85ac139150c39928 Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Wed, 6 Sep 2017 16:25:57 -0700
Subject: Remove duplicate task gettext:po_to_json

It is already run in "bundle exec rake gitlab:assets:compile".
---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70b0cde17ea..7b42e661dff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -247,7 +247,6 @@ setup-test-env:
   script:
     - node --version
     - yarn install --frozen-lockfile --cache-folder .yarn-cache
-    - bundle exec rake gettext:po_to_json
     - bundle exec rake gitlab:assets:compile
     - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
     - scripts/gitaly-test-build # Do not use 'bundle exec' here
@@ -495,7 +494,6 @@ gitlab:assets:compile:
     NO_COMPRESSION: "true"
   script:
     - yarn install --frozen-lockfile --production --cache-folder .yarn-cache
-    - bundle exec rake gettext:po_to_json
     - bundle exec rake gitlab:assets:compile
   artifacts:
     name: webpack-report
-- 
cgit v1.2.3


From ecdab9f96f5ab94292b52010618847e88e8573fd Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axil@gitlab.com>
Date: Thu, 7 Sep 2017 15:43:20 +0000
Subject: Add script and job to trigger a docs build

---
 .gitlab-ci.yml | 42 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b42e661dff..dadce073309 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,6 +40,7 @@ stages:
   - test
   - post-test
   - pages
+  - post-cleanup
 
 # Predefined scopes
 .dedicated-runner: &dedicated-runner
@@ -153,8 +154,7 @@ stages:
     - master@gitlab/gitlabhq
     - master@gitlab/gitlab-ee
 
-# Trigger a package build on omnibus-gitlab repository
-
+# Trigger a package build in omnibus-gitlab repository
 build-package:
   image: ruby:2.3-alpine
   before_script: []
@@ -166,11 +166,47 @@ build-package:
   cache: {}
   when: manual
   script:
-    - scripts/trigger-build
+    - scripts/trigger-build-omnibus
   only:
     - //@gitlab-org/gitlab-ce
     - //@gitlab-org/gitlab-ee
 
+# Review docs base
+.review-docs: &review-docs
+  image: ruby:2.4-alpine
+  before_script: []
+  services: []
+  variables:
+    SETUP_DB: "false"
+    USE_BUNDLE_INSTALL: "false"
+  cache: {}
+  when: manual
+  only:
+    - branches
+
+# Trigger a docs build in gitlab-docs
+# Useful to preview the docs changes live
+review-docs-deploy:
+  <<: *review-docs
+  stage: build
+  environment:
+    name: review-docs/$CI_COMMIT_REF_NAME
+    on_stop: review-docs-cleanup
+  script:
+    - gem install gitlab --no-doc
+    - scripts/trigger-build-docs deploy
+
+# Cleanup remote environment of gitlab-docs
+review-docs-cleanup:
+  <<: *review-docs
+  stage: post-cleanup
+  environment:
+    name: review-docs/$CI_COMMIT_REF_NAME
+    action: stop
+  script:
+    - gem install gitlab --no-doc
+    - scripts/trigger-build-docs cleanup
+
 # Retrieve knapsack and rspec_flaky reports
 retrieve-tests-metadata:
   <<: *tests-metadata-state
-- 
cgit v1.2.3


From 77ccbe06ea0762f393c3d4bd8d9824fca44acc8b Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Fri, 8 Sep 2017 09:44:28 +0200
Subject: Exclude migration-paths job when executing docs-only jobs

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dadce073309..f27d809af3c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -448,6 +448,7 @@ db:migrate:reset-mysql:
 .migration-paths: &migration-paths
   <<: *dedicated-runner
   <<: *pull-cache
+  <<: *except-docs
   stage: test
   variables:
     SETUP_DB: "false"
-- 
cgit v1.2.3