Commit bba8fb31 authored by nimrod's avatar nimrod
Browse files

fixup! A few updates.

parent c3bd3999

.gitlab-ci.yml

+21 −8
Original line number Original line Diff line number Diff line
@@ -11,6 +11,21 @@ include: 
  - remote: |-

  - remote: |-

      https://git.shore.co.il/shore/ci-templates/-/raw/master/templates/notify.yml

      https://git.shore.co.il/shore/ci-templates/-/raw/master/templates/notify.yml





stages:

  - build-base

  - deploy-base

  - build

  - deploy

  - test



.container-build-base:

  extends: .container-build

  stage: build-base



.container-push-base:

  extends: .container-push

  stage: deploy-base



lint templates:

lint templates:

  image: registry.shore.co.il/ci-images:pre-commit

  image: registry.shore.co.il/ci-images:pre-commit

  stage: test

  stage: test
@@ -42,12 +57,12 @@ lint templates: 
# bats image:

# bats image:





build-bats:

build-bats:

  extends: .container-build

  extends: .container-build-base

  variables:

  variables:

    CONTEXT: images/bats

    CONTEXT: images/bats





push-bats:

push-bats:

  extends: .container-push

  extends: .container-push-base

  variables:

  variables:

    CONTEXT: images/bats

    CONTEXT: images/bats

    IMAGE: ci-images

    IMAGE: ci-images
@@ -59,12 +74,12 @@ push-bats: 
# docker image:

# docker image:





build-docker:

build-docker:

  extends: .container-build

  extends: .container-build-base

  variables:

  variables:

    CONTEXT: images/docker

    CONTEXT: images/docker





push-docker:

push-docker:

  extends: .container-push

  extends: .container-push-base

  variables:

  variables:

    CONTEXT: images/docker

    CONTEXT: images/docker

    IMAGE: ci-images

    IMAGE: ci-images
@@ -110,8 +125,6 @@ push-k8s: 
# pre-commit image:

# pre-commit image:





build-pre-commit:

build-pre-commit:

  needs:

    - push-python3

  extends: .container-build

  extends: .container-build

  variables:

  variables:

    CONTEXT: images/pre-commit

    CONTEXT: images/pre-commit
@@ -129,12 +142,12 @@ push-pre-commit: 
# python3 image:

# python3 image:





build-python3:

build-python3:

  extends: .container-build

  extends: .container-build-base

  variables:

  variables:

    CONTEXT: images/python3

    CONTEXT: images/python3





push-python3:

push-python3:

  extends: .container-push

  extends: .container-push-base

  variables:

  variables:

    CONTEXT: images/python3

    CONTEXT: images/python3

    IMAGE: ci-images

    IMAGE: ci-images