Commit c3e1e1a1 authored by Tim Leers's avatar Tim Leers Committed by Geoff Simmons

push docker images within integration test

parent e7ebaf29
stages: stages:
- e2e - e2e
- test - test
- build
test: test:
image: golang:1.11.6 image: golang:1.11.6
...@@ -28,23 +27,23 @@ test: ...@@ -28,23 +27,23 @@ test:
- make check - make check
build:controller: # build:controller:
stage: build # stage: build
image: docker:19.03.8 # image: docker:19.03.8
services: # services:
- docker:19.03.8-dind # - docker:19.03.8-dind
variables: # variables:
DOCKER_TLS_CERTDIR: "/certs" # DOCKER_TLS_CERTDIR: "/certs"
CI_REGISTRY_IMAGE: varnish-controller # CI_REGISTRY_IMAGE: varnish-controller
script: # script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY # - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- docker pull $CI_REGISTRY/timleers/k8s-ingress/$CI_REGISTRY_IMAGE:latest || true # - docker pull $CI_REGISTRY/timleers/k8s-ingress/$CI_REGISTRY_IMAGE:latest || true
- docker build --cache-from $CI_REGISTRY/timleers/k8s-ingress/$CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --tag $CI_REGISTRY_IMAGE:latest -f container/Dockerfile.controller . # - docker build --cache-from $CI_REGISTRY/timleers/k8s-ingress/$CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --tag $CI_REGISTRY_IMAGE:latest -f container/Dockerfile.controller .
- docker tag $CI_REGISTRY_IMAGE:latest $CI_REGISTRY/timleers/k8s-ingress/$CI_REGISTRY_IMAGE:$CI_COMMIT_SHA # - docker tag $CI_REGISTRY_IMAGE:latest $CI_REGISTRY/timleers/k8s-ingress/$CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
- docker tag $CI_REGISTRY_IMAGE:latest $CI_REGISTRY/timleers/k8s-ingress/$CI_REGISTRY_IMAGE:latest # - docker tag $CI_REGISTRY_IMAGE:latest $CI_REGISTRY/timleers/k8s-ingress/$CI_REGISTRY_IMAGE:latest
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY # - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- docker push $CI_REGISTRY/timleers/k8s-ingress/$CI_REGISTRY_IMAGE:$CI_COMMIT_SHA # - docker push $CI_REGISTRY/timleers/k8s-ingress/$CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
- docker push $CI_REGISTRY/timleers/k8s-ingress/$CI_REGISTRY_IMAGE:latest # - docker push $CI_REGISTRY/timleers/k8s-ingress/$CI_REGISTRY_IMAGE:latest
# integration: # integration:
# stage: e2e # stage: e2e
...@@ -81,3 +80,8 @@ integration: ...@@ -81,3 +80,8 @@ integration:
- kubectl get services --all-namespaces -o wide - kubectl get services --all-namespaces -o wide
script: script:
- test/e2e.gitlab.sh - test/e2e.gitlab.sh
- docker tag varnish-ingress/controller $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/controller:$CI_COMMIT_SHA
- docker tag varnish-ingress/varnish $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/varnish:$CI_COMMIT_SHA
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- docker push $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/controller:$CI_COMMIT_SHA
- docker push $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/varnish:$CI_COMMIT_SHA
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment