Commit 4da3eec3 authored by CarlosGC1989's avatar CarlosGC1989
Browse files

Merge branch 'dev' of gitlab.com:redmic-project/client/web into dev

parents b1c9483c ab7930a9

.gitlab-ci.yml

+10 −7
Original line number Diff line number Diff line 
image: redmic/web-gitlab



stages:

  - pre-build

  - test-code
@@ -11,6 +9,7 @@ stages: 


prepare-unbuilt-version:

  stage: pre-build

  image: registry.gitlab.com/redmic-project/docker/web-build:latest

  variables:

    GIT_SUBMODULE_STRATEGY: normal

  script:
@@ -43,6 +42,7 @@ prepare-unbuilt-version: 


run-unit-tests:

  stage: test-code

  image: registry.gitlab.com/redmic-project/docker/web-build:latest

  script: grunt test

  only:

    - branches
@@ -60,6 +60,7 @@ run-unit-tests: 


run-modules-functional-tests:

  stage: test-code

  image: registry.gitlab.com/redmic-project/docker/web-build:latest

  script:

    - echo $(head -1 /etc/hosts | cut -f1) redmic.local >> /etc/hosts

    - npm start -- -p 80 &
@@ -80,6 +81,7 @@ run-modules-functional-tests: 


prepare-built-version:

  stage: build

  image: registry.gitlab.com/redmic-project/docker/web-build:latest

  variables:

    GIT_SUBMODULE_STRATEGY: normal

  script:
@@ -108,7 +110,7 @@ prepare-built-version: 


docker-build-commit:

  stage: package

  image: redmic/docker-gitlab

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    DOCKER_DRIVER: overlay2

  services:
@@ -125,7 +127,7 @@ docker-build-commit: 


docker-build-tag:

  stage: package

  image: redmic/docker-gitlab

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    DOCKER_DRIVER: overlay2

  services:
@@ -169,7 +171,7 @@ container_scanning: 


deploy-dev:

  stage: deploy

  image: redmic/docker-gitlab

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}
@@ -195,7 +197,7 @@ deploy-dev: 


deploy-supporting-branch:

  stage: deploy

  image: redmic/docker-gitlab

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}
@@ -224,6 +226,7 @@ deploy-supporting-branch: 


run-functional-tests:

  stage: test-deploy

  image: registry.gitlab.com/redmic-project/docker/web-build:latest

  tags:

    - client

    - functional
@@ -251,7 +254,7 @@ run-functional-tests: 


deploy-pro:

  stage: deploy

  image: redmic/docker-gitlab

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}