Merge branch 'pipeline-manual-release-fix'

pivotal · Oct 12, 2018 · c61fc52 · c61fc52
2 parents 89f4a64 + b8b6670
commit c61fc52
Showing 1 changed file with 29 additions and 29 deletions.
diff --git a/ci/pipelines/release.yml.erb b/ci/pipelines/release.yml.erb
@@ -11,7 +11,7 @@ resource_types:
 <% end %>
 
 resources:
-- name: git-master
+- name: lf-git
   type: git
   source:
     uri: git@github.com:pivotal-legacy/LicenseFinder.git
@@ -43,7 +43,7 @@ resources:
     username: ((LicenseFinderDocker.username))
     password: ((LicenseFinderDocker.password))
 
-- name: git-release
+- name: lf-release
   type: github-release
   source:
     owner: pivotal
@@ -61,89 +61,89 @@ jobs:
 
 - name: patch-version
   plan:
-  - get: git-master
+  - get: lf-git
     passed: [<%= ruby_versions.map{ |version| "ruby-#{version}"}.join(', ') %>]
   - get: dockerhub
     params:
       save: true
   - task: bump-version
+    image: dockerhub
     params:
-      image: docker-image
       GIT_USERNAME: ((GithubApiUser))
       GIT_EMAIL: ((GithubApiEmail))
-    file: git-master/ci/tasks/bump-patch-version.yml
-  - put: git-master
+    file: lf-git/ci/tasks/bump-patch-version.yml
+  - put: lf-git
     params:
-      repository: git-master-changed
+      repository: lf-git-changed
 
 - name: release
   plan:
-  - get: git-master
+  - get: lf-git
     trigger: true
     passed: [ patch-version ]
   - get: dockerhub
     params:
       save: true
-  - get: git-release
+  - get: lf-release
   - task: update-changelog
-    image: docker-image
+    image: dockerhub
     params:
       GIT_USERNAME: ((GithubApiUser))
       GIT_EMAIL: ((GithubApiEmail))
-    file: git-master/ci/tasks/update-changelog.yml
+    file: lf-git/ci/tasks/update-changelog.yml
   - put: dockerhub
     params:
-      build: git-master
+      build: lf-git
       tag: version/version.txt
       tag_as_latest: true
-  - put: git-master
+  - put: lf-git
     params:
-      repository: git-master-changed
+      repository: lf-git-changed
   - task: build-and-push-gem
-    image: docker-image
+    image: dockerhub
     params:
       GIT_USERNAME: ((GithubApiUser))
       GIT_EMAIL: ((GithubApiEmail))
       GIT_PRIVATE_KEY: ((CfOslBot.private_key))
       GEM_API_KEY: ((LicenseFinderGemApiKey))
-    file: git-master/ci/tasks/build-and-push-gem.yml
-  - put: git-release
+    file: lf-git/ci/tasks/build-and-push-gem.yml
+  - put: lf-release
     params:
       name: version/tag.txt
       tag: version/tag.txt
       body: version/changelog.txt
 
 - name: manual-release
   plan:
-  - get: git-master
+  - get: lf-git
     passed: [<%= ruby_versions.map{ |version| "ruby-#{version}"}.join(', ') %>]
   - get: dockerhub
     params:
       save: true
-  - get: git-release
+  - get: lf-release
   - task: update-changelog
-    image: docker-image
+    image: dockerhub
     params:
       GIT_USERNAME: ((GithubApiUser))
       GIT_EMAIL: ((GithubApiEmail))
-    file: git-master/ci/tasks/update-changelog.yml
+    file: lf-git/ci/tasks/update-changelog.yml
   - put: dockerhub
     params:
-      build: git-master
+      build: lf-git
       tag_file: version/version.txt
       tag_as_latest: true
   - task: build-and-push-gem
-    image: docker-image
+    image: dockerhub
     params:
       GIT_USERNAME: ((GithubApiUser))
       GIT_EMAIL: ((GithubApiEmail))
       GIT_PRIVATE_KEY: ((CfOslBot.private_key))
       GEM_API_KEY: ((LicenseFinderGemApiKey))
-    file: git-master/ci/tasks/build-and-push-gem.yml
-  - put: git-master
+    file: lf-git/ci/tasks/build-and-push-gem.yml
+  - put: lf-git
     params:
-      repository: git-master-changed
-  - put: git-release
+      repository: lf-git-changed
+  - put: lf-release
     params:
       name: version/tag.txt
       tag: version/tag.txt
@@ -164,7 +164,7 @@ jobs:
     passed: [build-docker-image]
     trigger: true
   - get: LicenseFinder
-    resource: git-master
+    resource: lf-git
     trigger: true
     version: every
   - task: ruby-<%= ruby_version %>
@@ -190,7 +190,7 @@ jobs:
     passed: [build-docker-image]
     trigger: true
   - get: LicenseFinder
-    resource: git-master
+    resource: lf-git
     trigger: true
     version: every
   - task: run-rubocop