Merge branch 'update-gitlab-ci-yaml' into 'develop' (2e230df2) · Commits · TFS / controller

.gitlab-ci.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ include:
		- local: '/src/opticalattackmitigator/.gitlab-ci.yml'
		- local: '/src/opticalcentralizedattackdetector/.gitlab-ci.yml'
		- local: '/src/automation/.gitlab-ci.yml'
		- local: '/src/policy/.gitlab-ci.yml'
		#- local: '/src/webui/.gitlab-ci.yml'
		#- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'
		#- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'

src/policy/.gitlab-ci.yml

+42 −16

Original line number	Diff line number	Diff line
		@@ -12,45 +12,71 @@
		# See the License for the specific language governing permissions and
		# limitations under the License.

		variables:
		IMAGE_NAME_POLICY: 'policy'
		REPORTS_PATH_POLICY: "src/${IMAGE_NAME_POLICY}/reports"
		BUILD_ENV_POLICY: build-policy.env

		# Package application needed to run tests & build the image on next stage
		build policy:
		variables:
		IMAGE_NAME: 'policy' # name of the microservice
		IMAGE_NAME_TEST: 'policy-test' # name of the microservice
		IMAGE_TAG: '0.1.0' # tag of the container image (production, development, etc)
		stage: build
		script:
		- docker build -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/src/main/docker/Dockerfile.multistage.jvm ./src/$IMAGE_NAME/ --target builder
		- export IMAGE_TAG=$(grep -m1 '<version>' ./src/$IMAGE_NAME_POLICY/pom.xml \| grep -oP '(?<=>).*(?=<)')
		- echo "IMAGE_TAG=${IMAGE_TAG}" >> ${BUILD_ENV_POLICY}
		- cat ${BUILD_ENV_POLICY}
		- docker build -t "$IMAGE_NAME_POLICY:$IMAGE_TAG" -f ./src/$IMAGE_NAME_POLICY/src/main/docker/Dockerfile.multistage.jvm ./src/$IMAGE_NAME_POLICY/ --target builder
		after_script:
		- docker images --filter="dangling=true" --quiet \| xargs -r docker rmi
		artifacts:
		reports:
		dotenv: ${BUILD_ENV_POLICY}
		rules:
		- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" \|\| $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'
		- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'
		- changes:
		- src/$IMAGE_NAME/**
		- manifests/${IMAGE_NAME}service.yaml
		- src/$IMAGE_NAME_POLICY/**
		- manifests/${IMAGE_NAME_POLICY}service.yaml
		- .gitlab-ci.yml

		# Run tests, build & push the image
		unit_test policy:
		variables:
		IMAGE_NAME: 'policy' # name of the microservice
		IMAGE_NAME_TEST: 'policy-test' # name of the microservice
		IMAGE_TAG: '0.1.0' # tag of the container image (production, development, etc)
		REPORTS_CONTAINER: "${IMAGE_NAME_POLICY}-reports"
		stage: unit_test
		needs:
		- build policy
		before_script:
		- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
		- docker rm ${REPORTS_CONTAINER} \|\| true
		script:
		- docker build -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/src/main/docker/Dockerfile.multistage.jvm ./src/$IMAGE_NAME/ --target unit-test
		- docker build -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/src/main/docker/Dockerfile.multistage.jvm ./src/$IMAGE_NAME/ --target release
		- docker tag "$IMAGE_NAME:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"
		- docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"
		- echo "Running tests for image ${IMAGE_TAG}"
		- docker build -t "$IMAGE_NAME_POLICY:$IMAGE_TAG" -f ./src/$IMAGE_NAME_POLICY/src/main/docker/Dockerfile.multistage.jvm ./src/$IMAGE_NAME_POLICY/ --target unit-test
		# Transfer JaCoCo and Surefire reports from within tests image
		- docker create --name ${REPORTS_CONTAINER} "$IMAGE_NAME_POLICY:$IMAGE_TAG"
		- mkdir -p ${REPORTS_PATH_POLICY}
		- docker cp ${REPORTS_CONTAINER}:/app/target/site/jacoco/index.html ${REPORTS_PATH_POLICY}/coverage.html
		- docker cp ${REPORTS_CONTAINER}:/app/target/site/jacoco/jacoco.xml ${REPORTS_PATH_POLICY}/jacoco.xml
		- docker cp ${REPORTS_CONTAINER}:/app/target/surefire-reports/ ${REPORTS_PATH_POLICY}/
		- cat ${REPORTS_PATH_POLICY}/coverage.html \| grep -o 'Total[^%]%' \| sed 's/<.>/ /; s/Total/JaCoCo Coverage Total:/'
		- docker run -v "$(pwd)/src/${IMAGE_NAME_POLICY}:/${IMAGE_NAME_POLICY}" --rm registry.gitlab.com/haynes/jacoco2cobertura:1.0.7 python /opt/cover2cover.py ${IMAGE_NAME_POLICY}/reports/jacoco.xml ${IMAGE_NAME_POLICY}/src/main/java > ${REPORTS_PATH_POLICY}/cobertura.xml
		# Build final image
		- docker build -t "$IMAGE_NAME_POLICY:$IMAGE_TAG" -f ./src/$IMAGE_NAME_POLICY/src/main/docker/Dockerfile.multistage.jvm ./src/$IMAGE_NAME_POLICY/ --target release
		- docker tag "$IMAGE_NAME_POLICY:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$IMAGE_NAME_POLICY:$IMAGE_TAG"
		- docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME_POLICY:$IMAGE_TAG"
		after_script:
		- docker rm ${REPORTS_CONTAINER}
		- docker rm -f "$IMAGE_NAME_POLICY:$IMAGE_TAG"
		coverage: '/JaCoCo Coverage Total: ([0-9]{1,3})%/'
		artifacts:
		reports:
		junit:
		- ${REPORTS_PATH_POLICY}/surefire-reports/TEST-*.xml
		rules:
		- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" \|\| $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'
		- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'
		- changes:
		- src/$IMAGE_NAME/**
		- manifests/${IMAGE_NAME}service.yaml
		- src/$IMAGE_NAME_POLICY/**
		- manifests/${IMAGE_NAME_POLICY}service.yaml
		- .gitlab-ci.yml

		# Deployment of policy service in Kubernetes Cluster

src/policy/pom.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,12 @@
		</dependencyManagement>

		<dependencies>
		<dependency>
		<groupId>io.github.project-openubl</groupId>
		<artifactId>quarkus-bouncycastle</artifactId>
		<version>1.2.2.Final</version>
		</dependency>

		<dependency>
		<groupId>io.quarkus</groupId>
		<artifactId>quarkus-grpc</artifactId>

src/policy/src/main/docker/Dockerfile.multistage.jvm

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ RUN mvn --errors --batch-mode package -Dmaven.test.skip=true
		# Stage 2
		FROM builder AS unit-test

		RUN mvn --errors --batch-mode test
		RUN mvn --errors --batch-mode -Pgenerate-consolidated-coverage verify

		# Stage 3
		FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4 AS release

src/policy/src/main/resources/application.yml

+9 −5

Original line number	Diff line number	Diff line
		@@ -13,28 +13,32 @@
		# limitations under the License.

		quarkus:
		banner:
		path: teraflow-policy-banner.txt
		grpc:
		server:
		port: 9999
		enable-reflection-service: true
		http:
		port: 8080

		container-image:
		group: teraflow-h2020
		name: controller/policy
		registry: registry.gitlab.com

		kubernetes:
		name: policyservice
		image-pull-policy: Always
		add-version-to-label-selectors: false
		labels:
		app: policyservice
		add-version-to-label-selectors: false
		readiness-probe:
		initial-delay: 5s
		period: 45s
		initial-delay: 2s
		period: 10s
		liveness-probe:
		initial-delay: 5s
		period: 45s
		initial-delay: 2s
		period: 10s
		ports:
		http:
		host-port: 8080

Admin message