Use stable name for docker registry (#1220)

cloudfoundry · Aug 15, 2017 · 17030f5 · 17030f5
1 parent 7f3c976
commit 17030f5
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 27 deletions.
diff --git a/deploy/ci/console-tests-pr.yml b/deploy/ci/console-tests-pr.yml
@@ -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
@@ -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}}

diff --git a/deploy/ci/scripts/build_dcind_image.sh b/deploy/ci/scripts/build_dcind_image.sh
@@ -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
@@ -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
 
diff --git a/deploy/ci/scripts/daemon.json b/deploy/ci/scripts/daemon.json
@@ -1,2 +1,2 @@
-{ "insecure-registries":["10.84.93.11:5000"]}
+{ "insecure-registries": ["ci-registry.ngrok.io:80"]}
 
diff --git a/deploy/ci/tasks/build-images/build-dc.yml b/deploy/ci/tasks/build-images/build-dc.yml
@@ -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
@@ -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
diff --git a/deploy/ci/tasks/build-images/build-helm.yml b/deploy/ci/tasks/build-images/build-helm.yml
@@ -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
@@ -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
diff --git a/deploy/ci/tasks/portal-proxy/run-unit-tests.yml b/deploy/ci/tasks/portal-proxy/run-unit-tests.yml
@@ -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

diff --git a/deploy/ci/tasks/release/build-helm.yml b/deploy/ci/tasks/release/build-helm.yml
@@ -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

diff --git a/deploy/ci/tasks/release/create-chart.yml b/deploy/ci/tasks/release/create-chart.yml
@@ -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

diff --git a/deploy/ci/tasks/release/update-gh-release.yml b/deploy/ci/tasks/release/update-gh-release.yml
@@ -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

diff --git a/deploy/ci/tasks/stratos-ui/prep-proxy-image.yml b/deploy/ci/tasks/stratos-ui/prep-proxy-image.yml
@@ -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

diff --git a/deploy/ci/tasks/stratos-ui/run-tests.yml b/deploy/ci/tasks/stratos-ui/run-tests.yml
@@ -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

diff --git a/deploy/ci/tasks/stratos-ui/run-unit-tests.yml b/deploy/ci/tasks/stratos-ui/run-unit-tests.yml
@@ -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
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"]}