diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-03-31 16:57:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 16:57:07 -0500 |
| commit | d1bf5e0a5270dac11d6cd5aa9d4723a12221ae8b (patch) | |
| tree | 8a5677558578d83edd2fc2def96263265add3a18 /roles/openshift_examples/examples-sync.sh | |
| parent | 577b4f46ebf8db9b3e5601367cc7bc7cd73bce28 (diff) | |
| parent | 945812d9849305649d52a24936b3288a44a5cdad (diff) | |
| download | openshift-d1bf5e0a5270dac11d6cd5aa9d4723a12221ae8b.tar.gz openshift-d1bf5e0a5270dac11d6cd5aa9d4723a12221ae8b.tar.bz2 openshift-d1bf5e0a5270dac11d6cd5aa9d4723a12221ae8b.tar.xz openshift-d1bf5e0a5270dac11d6cd5aa9d4723a12221ae8b.zip | |
Merge pull request #3823 from sdodson/image-stream-sync
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_examples/examples-sync.sh')
| -rwxr-xr-x | roles/openshift_examples/examples-sync.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/roles/openshift_examples/examples-sync.sh b/roles/openshift_examples/examples-sync.sh index 0a2d3005f..0f2bec6d3 100755 --- a/roles/openshift_examples/examples-sync.sh +++ b/roles/openshift_examples/examples-sync.sh @@ -6,7 +6,7 @@ # This script should be run from openshift-ansible/roles/openshift_examples XPAAS_VERSION=ose-v1.3.6 -ORIGIN_VERSION=${1:-v1.5} +ORIGIN_VERSION=${1:-v1.6} RHAMP_TAG=1.0.0.GA RHAMP_TEMPLATE=https://raw.githubusercontent.com/3scale/rhamp-openshift-templates/${RHAMP_TAG}/apicast-gateway/apicast-gateway-template.yml EXAMPLES_BASE=$(pwd)/files/examples/${ORIGIN_VERSION} @@ -30,14 +30,15 @@ mv application-templates-${XPAAS_VERSION}/jboss-image-streams.json ${EXAMPLES_BA mv application-templates-GA/fis-image-streams.json ${EXAMPLES_BASE}/xpaas-streams/fis-image-streams.json mv application-templates-GA/quickstarts/* ${EXAMPLES_BASE}/xpaas-templates/ find application-templates-${XPAAS_VERSION}/ -name '*.json' ! -wholename '*secret*' ! -wholename '*demo*' -exec mv {} ${EXAMPLES_BASE}/xpaas-templates/ \; +popd + wget https://raw.githubusercontent.com/redhat-developer/s2i-dotnetcore/master/dotnet_imagestreams.json -O ${EXAMPLES_BASE}/image-streams/dotnet_imagestreams.json wget https://raw.githubusercontent.com/redhat-developer/s2i-dotnetcore/master/templates/dotnet-example.json -O ${EXAMPLES_BASE}/quickstart-templates/dotnet-example.json wget https://raw.githubusercontent.com/redhat-developer/s2i-dotnetcore/master/templates/dotnet-pgsql-persistent.json -O ${EXAMPLES_BASE}/quickstart-templates/dotnet-pgsql-persistent.json +wget ${RHAMP_TEMPLATE} -O ${EXAMPLES_BASE}/quickstart-templates/apicast-gateway-template.yml wget https://raw.githubusercontent.com/openshift/origin-metrics/master/metrics.yaml -O ../openshift_hosted_templates/files/${ORIGIN_VERSION}/origin/metrics-deployer.yaml wget https://raw.githubusercontent.com/openshift/origin-metrics/enterprise/metrics.yaml -O ../openshift_hosted_templates/files/${ORIGIN_VERSION}/enterprise/metrics-deployer.yaml wget https://raw.githubusercontent.com/openshift/origin-aggregated-logging/master/deployer/deployer.yaml -O ../openshift_hosted_templates/files/${ORIGIN_VERSION}/origin/logging-deployer.yaml wget https://raw.githubusercontent.com/openshift/origin-aggregated-logging/enterprise/deployment/deployer.yaml -O ../openshift_hosted_templates/files/${ORIGIN_VERSION}/enterprise/logging-deployer.yaml -wget ${RHAMP_TEMPLATE} -O ${EXAMPLES_BASE}/quickstart-templates/apicast-gateway-template.yml -popd git diff files/examples |