Commit b7998a9e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'feature-updateCI' into 'dev' 

Feature update ci

See merge request redmic-project/server/time-series!5
parents 109be7e2 36ab5478

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@ 
!.env

**/target

*/dist

pom.xml.*

.gitlab-ci.yml

+27 −239
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/maven-building-functional-unit.yml'

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/license-listing.yml'

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/packaging.yml'

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment-functional-unit.yml'



stages:

  - build-lib

  - build-services

  - build-service

  - license-list

  - package

  - test-package

  - deploy



variables:

  DOCKER_DRIVER: overlay2

  STACK: time-series

  IMAGE_NAME: ${CI_REGISTRY_IMAGE}

  IMAGE_TAG: ${CI_COMMIT_SHA}

  MAVEN_OPTS: -Dmaven.repo.local=.m2/repository



services:

  - docker:dind



maven-build-lib:

  stage: build-lib

  image: registry.gitlab.com/redmic-project/docker/maven:${MAVEN_IMAGE_TAG}

  variables:

    SPRING_PROFILES_ACTIVE: test

  DOCKER_BUILD_ARGS: --build-arg PARENT_IMAGE_NAME=${REDMIC_SERVER_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${REDMIC_SERVER_IMAGE_TAG}

  STACK: ${CI_PROJECT_NAME}

  LOGGING_LEVEL_ROOT: error

  LOGGING_LEVEL_ORG_SPRINGFRAMEWORK: error

  only:

    - branches

  cache:

    paths:

      - .m2/repository/

  script:

    - mvn -pl :${CI_PROJECT_NAME}-lib -U clean deploy -B

    - "COVERAGE=$(xmllint --html --xpath '//table[@id=\"coveragetable\"]/tfoot//td[@class=\"ctr2\"][1]/text()' ${CI_PROJECT_NAME}-lib/target/site/jacoco/index.html)"

    - 'echo "Coverage: ${COVERAGE}"'

  after_script:

    - rm -rf .m2/repository/es

  artifacts:

    name: "${CI_PROJECT_NAME}-lib-${CI_COMMIT_REF_NAME}"

    expire_in: '6 months'

    paths:

      - "${CI_PROJECT_NAME}-lib/target/*.jar"



maven-build-commands:

  stage: build-services

  image: registry.gitlab.com/redmic-project/docker/maven:${MAVEN_IMAGE_TAG}

  variables:

    SPRING_PROFILES_ACTIVE: test

    LOGGING_LEVEL_ROOT: "off"

    LOGGING_LEVEL_ORG_SPRINGFRAMEWORK: error

  LOGGING_LEVEL_ES_REDMIC: error

    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    TEST_USER_PASSWORD: ${TEST_USER_PASSWORD}

  only:

    - branches

  cache:

    paths:

      - .m2/repository/

  script:

    - mvn -pl :${CI_PROJECT_NAME}-commands -U clean verify spring-boot:repackage -B

    - "COVERAGE=$(xmllint --html --xpath '//table[@id=\"coveragetable\"]/tfoot//td[@class=\"ctr2\"][1]/text()' ${CI_PROJECT_NAME}-commands/target/site/jacoco/index.html)"

    - 'echo "Coverage: ${COVERAGE}"'

  after_script:

    - rm -rf .m2/repository/es

  artifacts:

    name: "${CI_PROJECT_NAME}-commands-${CI_COMMIT_REF_NAME}"

    expire_in: '6 months'

    paths:

      - "${CI_PROJECT_NAME}-commands/dist/*.jar"

      - "${CI_PROJECT_NAME}-commands/target/generated-docs"



maven-build-view:

  stage: build-services

  image: registry.gitlab.com/redmic-project/docker/maven:${MAVEN_IMAGE_TAG}

  variables:

    GIT_SUBMODULE_STRATEGY: normal

    SPRING_PROFILES_ACTIVE: test

    LOGGING_LEVEL_ROOT: error

    LOGGING_LEVEL_ORG_SPRINGFRAMEWORK: error

    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    TEST_USER_PASSWORD: ${TEST_USER_PASSWORD}

    ELASTIC_CLUSTERNAME: ${DEV_ELASTIC_CLUSTERNAME}

  only:

    - branches

  cache:

    paths:

      - .m2/repository/

  script:

  before_script:

    - mvn -f elasticsearch-cluster-runner compile

    - mvn -f elasticsearch-cluster-runner exec:java -Dexec.args="-numOfNode 1 -clusterName ${ELASTIC_CLUSTERNAME}" > elasticsearch-cluster-runner-out.txt &

    - mvn -pl :${CI_PROJECT_NAME}-view -U clean verify spring-boot:repackage -B

    - "COVERAGE=$(xmllint --html --xpath '//table[@id=\"coveragetable\"]/tfoot//td[@class=\"ctr2\"][1]/text()' ${CI_PROJECT_NAME}-view/target/site/jacoco/index.html)"

    - 'echo "Coverage: ${COVERAGE}"'

  after_script:

    - rm -rf .m2/repository/es

  artifacts:

    name: "${CI_PROJECT_NAME}-view-${CI_COMMIT_REF_NAME}"

    expire_in: '6 months'

    paths:

      - "${CI_PROJECT_NAME}-view/dist/*.jar"

      - "${CI_PROJECT_NAME}-view/target/generated-docs"

      - "elasticsearch-cluster-runner-out.txt"

    when: always



docker-build-commit-non-master-branches:

  stage: package

  image: docker:stable

  variables:

    PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/redmic-server

    PARENT_IMAGE_TAG: latest

  services:

    - docker:dind

  only:

    - branches

  except:

    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - >

      docker build --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}

      -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-build-commit-master-branch:

  stage: package

  image: docker:stable

  variables:

    PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/redmic-server

    PARENT_IMAGE_TAG: latest

  services:

    - docker:dind

  only:

    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - >

      docker build --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}

      -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-tag-already-built-image:

  stage: package

  image: docker:stable

  services:

    - docker:dind

  only:

    - tags

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker pull ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}

    - docker tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}

    - docker push ${CI_REGISTRY_IMAGE}

    - mvn -f elasticsearch-cluster-runner exec:java -Dexec.args="-numOfNode 1 -clusterName ${ELASTIC_CLUSTERNAME}" &



container-scanning:

  stage: test-package

  image: docker:stable

  allow_failure: true

  services:

    - docker:stable-dind

  only:

    - branches

  script:

    - docker run -d --name db arminc/clair-db:latest

    - docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1

    - apk add -U wget ca-certificates

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker pull ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}

    - wget https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64

    - mv clair-scanner_linux_amd64 clair-scanner

    - chmod +x clair-scanner

    - touch clair-whitelist.yml

    - >

      ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log

      -w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} || true

  artifacts:

    paths: [gl-sast-container-report.json]



deploy-commands-supporting-branch:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICES_TO_CHECK: ${STACK}_${CI_PROJECT_NAME}-commands

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-commands.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-commands.dev.yml

    SPRING_PROFILES_ACTIVE: pre

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev/${CI_PROJECT_NAME}-commands

    url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands

  only:

    - branches

  except:

    - master

  when: manual



deploy-view-supporting-branch:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICES_TO_CHECK: ${STACK}_${CI_PROJECT_NAME}-view

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-view.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-view.dev.yml

    SPRING_PROFILES_ACTIVE: pre

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_CLUSTERNAME=${ELASTIC_CLUSTERNAME}

      ELASTIC_USER=${ELASTIC_USER} ELASTIC_PASSWORD=${ELASTIC_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev/${CI_PROJECT_NAME}-view

    url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view

  only:

    - branches

  except:

    - master

  when: manual



deploy-commands-pro:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICES_TO_CHECK: ${STACK}_${CI_PROJECT_NAME}-commands

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-commands.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-commands.prod.yml

    SPRING_PROFILES_ACTIVE: prod

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

.deploy-commands:

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro/${CI_PROJECT_NAME}-commands

    url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands

  only:

    - master

  when: manual

    url: https://${PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands



deploy-view-pro:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICES_TO_CHECK: ${STACK}_${CI_PROJECT_NAME}-view

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-view.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-view.prod.yml

    SPRING_PROFILES_ACTIVE: prod

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

.deploy-view:

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
@@ -259,8 +51,4 @@ deploy-view-pro: 
      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_CLUSTERNAME=${ELASTIC_CLUSTERNAME}

      ELASTIC_USER=${ELASTIC_USER} ELASTIC_PASSWORD=${ELASTIC_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro/${CI_PROJECT_NAME}-view

    url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view

  only:

    - master

  when: manual
 
    url: https://${PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view

pom.xml

+13 −14
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
	<groupId>es.redmic.time-series</groupId>

	<artifactId>time-series</artifactId>

	<packaging>pom</packaging>

	<version>0.2.1</version>

	<version>0.2.1-feature-updateCI</version>

	<name>Time series</name>



	<properties>
@@ -39,9 +39,6 @@ 
		<!-- Plugins -->

		<jacoco.version>0.8.1</jacoco.version>

		<asciidoctor.maven.plugin.version>1.5.6</asciidoctor.maven.plugin.version>



		<!-- Environment variables -->

		<env.MAVEN_REPO_URL>https://artifactory.redmic.net/artifactory</env.MAVEN_REPO_URL>

	</properties>



	<dependencies>
@@ -77,20 +74,22 @@ 
			<scope>test</scope>

		</dependency>

	</dependencies>

	<distributionManagement>

	<repositories>

		<repository>

			<id>central</id>

			<name>redmic-releases</name>

			<url>${env.MAVEN_REPO_URL}/libs-release-local</url>

			<name>libs-release</name>

			<url>https://artifactory.redmic.net/artifactory/libs-release</url>

		</repository>

		<snapshotRepository>

		<repository>

			<id>snapshots</id>

			<name>redmic-snapshots</name>

			<url>${env.MAVEN_REPO_URL}/libs-snapshot-local</url>

			<uniqueVersion>false</uniqueVersion>

		</snapshotRepository>

	</distributionManagement>

	<repositories>

			<name>libs-snapshot</name>

			<url>https://artifactory.redmic.net/artifactory/libs-snapshot</url>

		</repository>

		<repository>

			<id>osgeo</id>

			<name>Open Source Geospatial Foundation Repository</name>

			<url>http://download.osgeo.org/webdav/geotools/</url>

		</repository>

		<repository>

			<id>confluent</id>

			<name>Confluent</name>

time-series-commands/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
	<parent>

		<groupId>es.redmic.time-series</groupId>

		<artifactId>time-series</artifactId>

		<version>0.2.1</version>

		<version>0.2.1-feature-updateCI</version>

	</parent>



	<modelVersion>4.0.0</modelVersion>

time-series-lib/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<parent>

		<groupId>es.redmic.time-series</groupId>

		<artifactId>time-series</artifactId>

		<version>0.2.1</version>

		<version>0.2.1-feature-updateCI</version>

	</parent>



	<modelVersion>4.0.0</modelVersion>