Skip to content

fix idra and cloud links #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 6, 2019
Merged

fix idra and cloud links #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47a9643
fix cloud.ibm.com links
hmagph Feb 6, 2019
6350e91
explicit publish build result (idra)
hmagph Feb 6, 2019
15780cc
revert
hmagph Feb 6, 2019
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
3 changes: 3 additions & 0 deletions .bluemix/ci.pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ stages:
#!/bin/bash
# set -x
source <(curl -sSL "https://raw.githubusercontent.com/open-toolchain/commons/master/scripts/fetch_git_creds.sh")
export PATH=/opt/IBM/node-v4.2/bin:$PATH
npm install -g grunt-idra3
idra --publishbuildrecord --branch=$GIT_BRANCH --repositoryurl=$GIT_URL --commitid=$GIT_COMMIT --status=pass
- name: Unit Tests
type: tester
script: |-
Expand Down
4 changes: 2 additions & 2 deletions .bluemix/deploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
}
},
"registry-namespace": {
"description": "The namespace in the container image registry. You can set it up with {ibmcloud cr namespace-add]. Learn more at https://console.bluemix.net/docs/services/Registry/index.html .",
"description": "The namespace in the container image registry. You can set it up with {ibmcloud cr namespace-add]. Learn more at https://cloud.ibm.com/docs/services/Registry/index.html .",
"type": "string",
"pattern": "^[a-z0-9][-_a-z0-9]{2,28}[a-z0-9]$",
"$validate":{
Expand Down Expand Up @@ -378,7 +378,7 @@
"title": ""
},{
"type": "label",
"title": "Retrieve the Kubernetes cluster name with the CLI command 'ibmcloud cs clusters' or via the [console](https://console.bluemix.net/containers-kubernetes/home/clusters)."
"title": "Retrieve the Kubernetes cluster name with the CLI command 'ibmcloud cs clusters' or via the [console](https://cloud.ibm.com/containers-kubernetes/home/clusters)."
}
]
},{
Expand Down
8 changes: 4 additions & 4 deletions .bluemix/toolchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@ services:
type: Container Registry
lifecyclePhase: "DELIVER"
imageUrl: https://cloud.ibm.com/containers-kubernetes/img/registry-logo-5285793fdd.svg
documentationUrl: https://console.bluemix.net/docs/services/Registry/index.html
documentationUrl: https://cloud.ibm.com/docs/services/Registry/index.html
name: Private repositories
dashboard_url: https://console.bluemix.net/containers-kubernetes/registry/private
dashboard_url: https://cloud.ibm.com/containers-kubernetes/registry/private
description: Manage your Docker images in private container registry
additional-properties:
clusters:
Expand All @@ -181,9 +181,9 @@ services:
type: Container Service
lifecyclePhase: "RUN"
imageUrl: https://cloud.ibm.com/containers-kubernetes/img/container-service-logo-3aec89a836.svg
documentationUrl: https://console.bluemix.net/docs/containers/container_index.html
documentationUrl: https://cloud.ibm.com/docs/containers/container_index.html
name: Clusters
dashboard_url: https://console.bluemix.net/containers-kubernetes/clusters
dashboard_url: https://cloud.ibm.com/containers-kubernetes/clusters
description: Manage clusters
additional-properties:
form:
Expand Down
2 changes: 1 addition & 1 deletion instructions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
![Icon](./pics/umbrella-toolchain.png)
## Setup the toolchain
![Icon](./.bluemix/toolchain.png)
[![Create Toolchain](https://console.bluemix.net/devops/graphics/create_toolchain_button.png)](https://console.bluemix.net/devops/setup/deploy?repository=https://github.com/open-toolchain/microservices-helm-toolchain&refreshServices=&env_id=ibm:yp:us-south)
[![Create Toolchain](https://cloud.ibm.com/devops/graphics/create_toolchain_button.png)](https://cloud.ibm.com/devops/setup/deploy?repository=https://github.com/open-toolchain/microservices-helm-toolchain&refreshServices=&env_id=ibm:yp:us-south)
* Be sure to enter proper API key, cluster name, and valid registry namespace (not colliding with another user's). Failure to do so may result in failure in pipeline setup (if this happens, delete the toolchain and try again, you can verify your creds using the login script at the bottom of this page).
* Cluster must exist, but registry namespace and cluster namespace will both be configured by the toolchain automatically
* SauceLabs credentials should be entered either on setup or shortly after. When missing, they will cause the Solution (CD) pipeline to fail executing SauceLabs testing job. You can still configure the SauceLabs card, but then need to re-run the Solution pipeline stage manually again.
Expand Down