Skip to content
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

Use stable name for docker registry in CI pipelines #1220

Merged
merged 1 commit into from
Aug 15, 2017
Merged

Use stable name for docker registry in CI pipelines #1220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions deploy/ci/console-tests-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- do:
- task: run-unit-tests
privileged: true
timeout: 5m
timeout: 10m
file: stratos-ui/deploy/ci/tasks/stratos-ui/run-unit-tests.yml
on_failure:
put: stratos-ui
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:

- task: run-e2e-tests
privileged: true
timeout: 15m
timeout: 20m
file: stratos-ui/deploy/ci/tasks/stratos-ui/run-tests.yml
params:
REGISTRY_NAME: {{insecure-registry}}
Expand Down
9 changes: 5 additions & 4 deletions deploy/ci/scripts/build_dcind_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/bash

DIRPATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
DOCKER_REGISTRY=10.84.93.11:5000
DOCKER_REGISTRY=ci-registry.ngrok.io:80
TAG=${TAG:-latest}
REGISTRY_ADDRESS=${REGISTRY_ADDRESS:-registry.paas-ui}
REGISTRY_USER=${REGISTRY_USER:-stack}
REGISTRY_ADDRESS=${REGISTRY_ADDRESS:-ci-registry.ngrok.io}
REGISTRY_USER=${REGISTRY_USER:-ubuntu}

DOWNLOAD_FOLDER=${DIRPATH}/tmp
source ${DIRPATH}/build_common.sh
Expand Down Expand Up @@ -33,6 +33,7 @@ ADD https://archive.apache.org/dist/tomcat/tomcat-8/v8.0.28/bin/apache-tomcat-8.
ADD https://github.com/sequenceiq/uaa/releases/download/3.9.3/cloudfoundry-identity-uaa-3.9.3.war /tarballs/
EOT

docker build -f Dockerfile.dcind ./ -t ${DOCKER_REGISTRY}/concourse-dcind:${TAG} ${BUILD_ARGS}
sudo docker build -f Dockerfile.dcind ./ -t ${DOCKER_REGISTRY}/concourse-dcind:${TAG} ${BUILD_ARGS}
rm -f Dockerfile.dcind
sudo rm -f id_rsa

2 changes: 1 addition & 1 deletion deploy/ci/scripts/daemon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{ "insecure-registries":["10.84.93.11:5000"]}
{ "insecure-registries": ["ci-registry.ngrok.io:80"]}

6 changes: 3 additions & 3 deletions deploy/ci/tasks/build-images/build-dc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ inputs:
image_resource:
type: docker-image
source:
repository: 10.84.93.11:5000/concourse-dcind
repository: ci-registry.ngrok.io:80/concourse-dcind
tag: "latest"
insecure_registries: [ "10.84.93.11:5000" ]
insecure_registries: [ "ci-registry.ngrok.io:80" ]

run:
path: sh
Expand All @@ -21,4 +21,4 @@ run:
ls .
mv dev-certs-output/dev-certs stratos-ui/dev-certs
cd stratos-ui/deploy/docker-compose/
./build.sh -t test -r 10.84.93.11:5000
./build.sh -t test -r ci-registry.ngrok.io:80
6 changes: 3 additions & 3 deletions deploy/ci/tasks/build-images/build-helm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ inputs:
image_resource:
type: docker-image
source:
repository: 10.84.93.11:5000/concourse-dcind
repository: ci-registry.ngrok.io:80/concourse-dcind
tag: "latest"
insecure_registries: [ "10.84.93.11:5000" ]
insecure_registries: [ "ci-registry.ngrok.io:80" ]

run:
path: sh
Expand All @@ -22,4 +22,4 @@ run:
mv dev-certs-output/dev-certs stratos-ui/dev-certs
ls stratos-ui
cd stratos-ui/deploy/kubernetes
./build.sh -t test -r 10.84.93.11:5000
./build.sh -t test -r ci-registry.ngrok.io:80
4 changes: 2 additions & 2 deletions deploy/ci/tasks/portal-proxy/run-unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ inputs:
image_resource:
type: docker-image
source:
repository: 10.84.93.11:5000/portal-proxy-test
repository: ci-registry.ngrok.io:80/portal-proxy-test
tag: "latest"
insecure_registries: [ "10.84.93.11:5000" ]
insecure_registries: [ "ci-registry.ngrok.io:80" ]

run:
path: sh
Expand Down
4 changes: 2 additions & 2 deletions deploy/ci/tasks/release/build-helm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ outputs:
image_resource:
type: docker-image
source:
repository: 10.84.93.11:5000/concourse-dcind
repository: ci-registry.ngrok.io:80/concourse-dcind
tag: "latest"
insecure_registries: [ "10.84.93.11:5000" ]
insecure_registries: [ "ci-registry.ngrok.io:80" ]

run:
path: sh
Expand Down
4 changes: 2 additions & 2 deletions deploy/ci/tasks/release/create-chart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ outputs:
image_resource:
type: docker-image
source:
repository: 10.84.93.11:5000/linkyard/helm
repository: ci-registry.ngrok.io:80/linkyard/helm
tag: "latest"
insecure_registries: [ "10.84.93.11:5000" ]
insecure_registries: [ "ci-registry.ngrok.io:80" ]

run:
path: sh
Expand Down
4 changes: 2 additions & 2 deletions deploy/ci/tasks/release/update-gh-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ inputs:
image_resource:
type: docker-image
source:
repository: 10.84.93.11:5000/github-release
repository: ci-registry.ngrok.io:80/github-release
tag: "latest"
insecure_registries: [ "10.84.93.11:5000" ]
insecure_registries: [ "ci-registry.ngrok.io:80" ]

run:
path: sh
Expand Down
4 changes: 2 additions & 2 deletions deploy/ci/tasks/stratos-ui/prep-proxy-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ platform: linux
image_resource:
type: docker-image
source:
repository: 10.84.93.11:5000/susetest/console-proxy-builder
repository: ci-registry.ngrok.io:80/susetest/console-proxy-builder
tag: "latest"
insecure_registries: [ "10.84.93.11:5000" ]
insecure_registries: [ "ci-registry.ngrok.io:80" ]

inputs:
- name: stratos-ui
Expand Down
4 changes: 2 additions & 2 deletions deploy/ci/tasks/stratos-ui/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ inputs:
image_resource:
type: docker-image
source:
repository: 10.84.93.11:5000/concourse-dcind
repository: ci-registry.ngrok.io:80/concourse-dcind
tag: "latest"
insecure_registries: [ "10.84.93.11:5000" ]
insecure_registries: [ "ci-registry.ngrok.io:80" ]

run:
path: sh
Expand Down
4 changes: 2 additions & 2 deletions deploy/ci/tasks/stratos-ui/run-unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ inputs:
image_resource:
type: docker-image
source:
repository: 10.84.93.11:5000/splatform/stratos-concourse
repository: ci-registry.ngrok.io:80/splatform/stratos-concourse
tag: "latest"
insecure_registries: [ "10.84.93.11:5000" ]
insecure_registries: [ "ci-registry.ngrok.io:80" ]

run:
path: sh
Expand Down