From 2307e51c5c82ce7fa7b5a7f7ff7e85f49eb84098 Mon Sep 17 00:00:00 2001
From: Dilan Bellinghoven <ddbellinghoven@gmail.com>
Date: Wed, 9 Jan 2019 18:08:59 -0500
Subject: [PATCH] ci/pipeline.yml: Updated pipeline

---
 ci/pipeline.yml                               | 55 ++++++-------------
 ...erge-request.yml => test-pull-request.yml} |  4 +-
 2 files changed, 18 insertions(+), 41 deletions(-)
 rename ci/tasks/{test-merge-request.yml => test-pull-request.yml} (50%)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index e6eff1a..b50ae9d 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -11,12 +11,10 @@ resource_types:
     repository: arbourd/concourse-slack-alert-resource
     channel: '#build'
 
-- name: merge-request
+- name: pull-request
   type: docker-image
   source:
-    aws_secret_access_key: ((aws-secret-access-key))
-    aws_access_key_id: ((aws-access-key-id))
-    repository: ((docker-repository))/morningconsult/gitlab-merge-request-resource
+    repository: jtarchie/pr
 
 
 # ====================================
@@ -25,27 +23,14 @@ resource_types:
 #
 # ====================================
 resources:
-- name: go-elasticsearch-alerts-gitlab
-  type: git
-  source:
-    uri: ((gitlab-repo))
-    branch: master
-    private_key: ((gitlab-private-key))
-
-- name: go-elasticsearch-alerts-github
-  type: git
+- name: test-pull-request
+  type: pull-request
   source:
     private_key: ((github-private-key))
     access_token: ((github-access-token))
+    repo: morningconsult/docker-credential-vault-login
     uri: ((github-repo))
-    branch: master
-
-- name: test-merge-request
-  type: merge-request
-  source:
-    private_key: ((github-private-key))
-    private_token: ((gitlab-access-token))
-    uri: ((gitlab-repo))
+    base: master
 
 - name: new-release
   type: git
@@ -78,38 +63,30 @@ jobs:
   build_logs_to_retain: 30
   serial: true
   plan:
-  - get: test-merge-request
+  - get: test-pull-request
     trigger: true
-  - put: test-merge-request
+  - put: test-pull-request
     params:
-      repository: test-merge-request
+      repository: test-pull-request
       status: running
   - get: golang
   - task: test-pr
     image: golang
-    file: test-merge-request/ci/tasks/test-merge-request.yml
+    file: test-pull-request/ci/tasks/test-pull-request.yml
     on_success:
-      put: test-merge-request
+      put: test-pull-request
       params:
-        repository: test-merge-request
+        repository: test-pull-request
         status: success
         context: $BUILD_JOB_NAME
-        comment: test-merge-request/ci/pr_test_success
+        comment: test-pull-request/ci/pr_test_success
     on_failure:
-      put: test-merge-request
+      put: test-pull-request
       params:
-        repository: test-merge-request
+        repository: test-pull-request
         status: failed
         context: $BUILD_JOB_NAME
-        comment: test-merge-request/ci/pr_test_failure
-
-- name: github-mirror
-  serial: true
-  plan:
-  - get: go-elasticsearch-alerts-gitlab
-    trigger: true
-  - put: go-elasticsearch-alerts-github
-    params: {repository: go-elasticsearch-alerts-gitlab}
+        comment: test-pull-request/ci/pr_test_failure
 
 - name: build-release
   serial: true
diff --git a/ci/tasks/test-merge-request.yml b/ci/tasks/test-pull-request.yml
similarity index 50%
rename from ci/tasks/test-merge-request.yml
rename to ci/tasks/test-pull-request.yml
index 4801521..e6655df 100644
--- a/ci/tasks/test-merge-request.yml
+++ b/ci/tasks/test-pull-request.yml
@@ -1,7 +1,7 @@
 ---
 platform: linux
 inputs:
-  - name: test-merge-request
+  - name: test-pull-request
 run:
   path: ci/run-tests.sh
-  dir: test-merge-request
+  dir: test-pull-request