Skip to content
This repository has been archived by the owner on Feb 11, 2020. It is now read-only.

Move declarations of anchors to get tests to pass #372

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 22 additions & 23 deletions ci/pcf-pipelines/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,28 @@ groups:
- trigger-install-pcf-aws
- final-wipe-aws

atc_creds: &atc_creds
ATC_EXTERNAL_URL: {{atc_external_url}}
ATC_BASIC_AUTH_USERNAME: {{fly_basic_auth_username}}
ATC_BASIC_AUTH_PASSWORD: {{fly_basic_auth_password}}
ATC_TEAM_NAME: {{atc_team_name}}

vsphere_atc_creds: &vsphere_atc_creds
ATC_EXTERNAL_URL: {{atc_external_url}}
ATC_BASIC_AUTH_USERNAME: {{fly_basic_auth_username}}
ATC_BASIC_AUTH_PASSWORD: {{fly_basic_auth_password}}
ATC_TEAM_NAME: vsphere

notify_slack: &notify_slack
put: slack
params:
text: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME failed: $ATC_EXTERNAL_URL/builds/$BUILD_ID"

norm-ci-locks-params: &norm-ci-locks-params
uri: [email protected]:pivotal-cf/norm-ci-locks.git
branch: master
private_key: {{locks_git_ssh_key}}
retry_delay: 1m

resource_types:
- name: smuggler
Expand Down Expand Up @@ -1304,26 +1326,3 @@ jobs:
on_failure:
<<: *notify_slack
####### END VSPHERE OFFLINE

atc_creds: &atc_creds
ATC_EXTERNAL_URL: {{atc_external_url}}
ATC_BASIC_AUTH_USERNAME: {{fly_basic_auth_username}}
ATC_BASIC_AUTH_PASSWORD: {{fly_basic_auth_password}}
ATC_TEAM_NAME: {{atc_team_name}}

vsphere_atc_creds: &vsphere_atc_creds
ATC_EXTERNAL_URL: {{atc_external_url}}
ATC_BASIC_AUTH_USERNAME: {{fly_basic_auth_username}}
ATC_BASIC_AUTH_PASSWORD: {{fly_basic_auth_password}}
ATC_TEAM_NAME: vsphere

notify_slack: &notify_slack
put: slack
params:
text: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME failed: $ATC_EXTERNAL_URL/builds/$BUILD_ID"

norm-ci-locks-params: &norm-ci-locks-params
uri: [email protected]:pivotal-cf/norm-ci-locks.git
branch: master
private_key: {{locks_git_ssh_key}}
retry_delay: 1m
12 changes: 6 additions & 6 deletions upgrade-buildpacks/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.

cf_api_params: &cf_api_params
CF_API_URI: {{cf_api_uri}}
CF_USERNAME: {{cf_user}}
CF_PASSWORD: {{cf_password}}

resource_types:
- name: pivnet
type: docker-image
Expand Down Expand Up @@ -458,9 +463,4 @@ jobs:
params:
<<: *cf_api_params
SOURCE_BUILDPACK_NAME: tc_buildpack_latest
TARGET_BUILDPACK_NAME: tc_buildpack

cf_api_params: &cf_api_params
CF_API_URI: {{cf_api_uri}}
CF_USERNAME: {{cf_user}}
CF_PASSWORD: {{cf_password}}
TARGET_BUILDPACK_NAME: tc_buildpack