Fix CI

Author: philwebb

ci/pipeline.yml

@@ -12,6 +12,15 @@ anchors:
     build_number: ${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-${BUILD_NAME}
     disable_checksum_uploads: true
     threads: 8
+  sonatype-task-params: &sonatype-task-params
+    SONATYPE_USERNAME: ((sonatype-username))
+    SONATYPE_PASSWORD: ((sonatype-password))
+    SONATYPE_URL: ((sonatype-url))
+    SONATYPE_STAGING_PROFILE_ID: ((sonatype-staging-profile-id))
+  artifactory-task-params: &artifactory-task-params
+    ARTIFACTORY_SERVER: ((artifactory-server))
+    ARTIFACTORY_USERNAME: ((artifactory-username))
+    ARTIFACTORY_PASSWORD: ((artifactory-password))
 resource_types:
 - name: artifactory-resource
   type: registry-image
@@ -85,6 +94,8 @@ jobs:
   - task: build-ci-image
     privileged: true
     file: git-repo/ci/tasks/build-ci-image.yml
+    params:
+      DOCKER_HUB_AUTH: ((docker-hub-auth))
     output_mapping:
       image: ci-image
   - put: ci-image
@@ -208,10 +219,13 @@ jobs:
     file: git-repo/ci/tasks/promote.yml
     params:
       RELEASE_TYPE: M
+      <<: *artifactory-task-params
   - task: generate-changelog
     file: git-repo/ci/tasks/generate-changelog.yml
     params:
       RELEASE_TYPE: M
+      GITHUB_USERNAME: ((github-username))
+      GITHUB_TOKEN: ((github-ci-release-token))
   - put: github-pre-release
     params:
       name: generated-changelog/tag
@@ -234,6 +248,7 @@ jobs:
     file: git-repo/ci/tasks/promote.yml
     params:
       RELEASE_TYPE: RC
+      <<: *artifactory-task-params
   - task: generate-changelog
     file: git-repo/ci/tasks/generate-changelog.yml
     params:
@@ -260,8 +275,8 @@ jobs:
     file: git-repo/ci/tasks/promote.yml
     params:
       RELEASE_TYPE: RELEASE
-      SONATYPE_USER_TOKEN: ((sonatype-username))
-      SONATYPE_PASSWORD_TOKEN: ((sonatype-password))
+      <<: *artifactory-task-params
+      <<: *sonatype-task-params
 - name: create-github-release
   serial: true
   plan:
@@ -276,7 +291,7 @@ jobs:
   - task: generate-changelog
     file: git-repo/ci/tasks/generate-changelog.yml
     params:
-      RELEASE_TYPE: "RELEASE"
+      RELEASE_TYPE: RELEASE
   - put: github-release
     params:
       name: generated-changelog/tag
@@ -296,6 +311,9 @@ jobs:
   - task: publish-eclipse-update-site
     image: ci-image
     file: git-repo/ci/tasks/publish-eclipse-update-site.yml
+    params:
+      ARTIFACTORY_USERNAME: ((artifactory-username))
+      ARTIFACTORY_PASSWORD: ((artifactory-password))
 groups:
 - name: builds
   jobs: [build]

ci/tasks/build-ci-image.yml

@@ -13,7 +13,6 @@ caches:
 params:
   CONTEXT: ci-images-git-repo/ci/images
   DOCKERFILE: ci-images-git-repo/ci/images/ci-image/Dockerfile
-  DOCKER_HUB_AUTH: ((docker-hub-auth))
 run:
   path: /bin/sh
   args:

ci/tasks/build-project.yml

@@ -7,8 +7,6 @@ outputs:
 caches:
 - path: maven
 - path: gradle
-params:
-  BRANCH:
 run:
   path: bash
   args:

ci/tasks/generate-changelog.yml

@@ -7,11 +7,8 @@ image_resource:
     tag: '0.0.6'
 inputs:
 - name: git-repo
-- name: version
+- name: artifactory-repo
 outputs:
 - name: generated-changelog
-params:
-  GITHUB_USERNAME: ((github-username))
-  GITHUB_TOKEN: ((github-ci-release-token))
 run:
   path: git-repo/ci/scripts/generate-changelog.sh

ci/tasks/promote.yml

@@ -3,14 +3,5 @@ platform: linux
 inputs:
 - name: git-repo
 - name: artifactory-repo
-params:
-  RELEASE_TYPE:
-  SONATYPE_USER_TOKEN:
-  SONATYPE_PASSWORD_TOKEN:
-  SONATYPE_URL: ((sonatype-url))
-  SONATYPE_STAGING_PROFILE_ID: ((sonatype-staging-profile-id))
-  ARTIFACTORY_SERVER: ((artifactory-server))
-  ARTIFACTORY_USERNAME: ((artifactory-username))
-  ARTIFACTORY_PASSWORD: ((artifactory-password))
 run:
   path: git-repo/ci/scripts/promote.sh

ci/tasks/publish-eclipse-update-site.yml

@@ -3,8 +3,5 @@ platform: linux
 inputs:
 - name: git-repo
 - name: artifactory-repo
-params:
-  ARTIFACTORY_USERNAME: ((artifactory-username))
-  ARTIFACTORY_PASSWORD: ((artifactory-password))
 run:
   path: git-repo/ci/scripts/publish-eclipse-update-site.sh