refactor: add celery service to CI/CD pipeline and update related configurations (4a1a3aab) · Commits · OCF / pipeline-scripts

capif/.gitlab-ci.yml

+24 −1

Original line number	Diff line number	Diff line
		@@ -307,6 +307,11 @@ main_build_and_push:
		- docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG .
		- docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG
		- echo "----------------------------------------------------"
		- echo "### build and push celery image###"
		- cd $TMP_PWD/services/celery/
		- docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG .
		- docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG
		- echo "----------------------------------------------------"
		- docker logout $CI_REGISTRY
		<<: *main_common

		@@ -533,6 +538,23 @@ cvs_vault:
		SECURE_LOG_LEVEL: debug
		<<: *main_dnd

		cvs_celery:
		stage: main_container_scanning
		needs:
		- main_build_and_push
		before_script:
		- export TMP_PWD=$PWD
		- echo "TMP_PWD=$TMP_PWD"
		- git clone https://oauth2:${CI_JOB_TOKEN}@labs.etsi.org/rep/ocf/capif.git
		extends: container_scanning
		variables:
		CS_DEFAULT_BRANCH_IMAGE: "$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/celery:$CI_COMMIT_REF_SLUG"
		CS_IMAGE: "$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/celery:$CI_COMMIT_REF_SLUG"
		CS_REGISTRY_USER: $CI_REGISTRY_USER
		CS_REGISTRY_PASSWORD: $CAPIF_DOCKER_REGISTRY
		SECURE_LOG_LEVEL: debug
		<<: *main_dnd

		deploy_ocf_main:
		stage: deploy_ocf_main
		before_script:
		@@ -556,6 +578,7 @@ deploy_ocf_main:
		- cvs_ocf_routing_info_api
		- cvs_ocf_security_api
		- cvs_vault
		- cvs_celery
		<<: *main_common
		environment:
		name: review/main
		@@ -578,7 +601,7 @@ deploy_ocf_main:
		"ocf-api-provider-management" "ocf-auditing-api-logs"
		"ocf-discover-service-api" "ocf-events" "ocf-helper"
		"ocf-publish-service-api" "ocf-register" "ocf-routing-info"
		"ocf-security")
		"ocf-security" "celery")

		for chart in "${charts[@]}"; do
		yq e -i ".appVersion = \"main\"" "helm/capif/charts/$chart/Chart.yaml"

capif/templates/cd-deploy-ocf.gitlab-ci.yml

+13 −3

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@ deploy_ocf_staging:
		"ocf-api-provider-management" "ocf-auditing-api-logs"
		"ocf-discover-service-api" "ocf-events" "ocf-helper"
		"ocf-publish-service-api" "ocf-register" "ocf-routing-info"
		"ocf-security")
		"ocf-security" "celery")

		for chart in "${charts[@]}"; do
		yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" "helm/capif/charts/$chart/Chart.yaml"
		@@ -298,7 +298,7 @@ deploy_ocf_oficial_staging:
		"ocf-api-provider-management" "ocf-auditing-api-logs"
		"ocf-discover-service-api" "ocf-events" "ocf-helper"
		"ocf-publish-service-api" "ocf-register" "ocf-routing-info"
		"ocf-security")
		"ocf-security" "celery")

		for chart in "${charts[@]}"; do
		yq e -i ".appVersion = \"staging\"" "helm/capif/charts/$chart/Chart.yaml"
		@@ -488,7 +488,7 @@ deploy_ocf_dev:
		"ocf-api-provider-management" "ocf-auditing-api-logs"
		"ocf-discover-service-api" "ocf-events" "ocf-helper"
		"ocf-publish-service-api" "ocf-register" "ocf-routing-info"
		"ocf-security")
		"ocf-security" "celery")

		for chart in "${charts[@]}"; do
		yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" "helm/capif/charts/$chart/Chart.yaml"
		@@ -628,6 +628,16 @@ deploy_ocf_dev:
		--set mongo-express.ingress.hosts[0].paths[0].pathType="Prefix" \
		--set redis.image.repository=labs.etsi.org:5050/ocf/capif/redis \
		--set redis.image.tag=7.4.2-alpine \
		--set celery-beat.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/celery \
		--set celery-beat.image.tag=$CI_COMMIT_REF_SLUG \
		--set celery-beat.env.celeryModel=beat \
		--set celery-beat.env.redisHost=redis \
		--set celery-beat.env.redisPort=6379 \
		--set celery-worker.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/celery \
		--set celery-worker.image.tag=$CI_COMMIT_REF_SLUG \
		--set celery-worker.env.celeryModel=worker \
		--set celery-worker.env.redisHost=redis \
		--set celery-worker.env.redisPort=6379 \
		--wait --timeout=10m --create-namespace --atomic

		delete_ocf_dev:

capif/templates/ci_dev.gitlab-ci.yml

+8 −3

Original line number	Diff line number	Diff line
		@@ -86,10 +86,9 @@ dev_linting_docker:
		../hadolint --version

		# Array of service names
		SERVICES=("vault" "nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API"
		SERVICES=("celery" "vault" "nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API"
		"TS29222_CAPIF_API_Provider_Management_API" "TS29222_CAPIF_Auditing_API" "TS29222_CAPIF_Discover_Service_API" "TS29222_CAPIF_Events_API"
		"TS29222_CAPIF_Logging_API_Invocation_API" "TS29222_CAPIF_Publish_Service_API" "TS29222_CAPIF_Routing_Info_API" "TS29222_CAPIF_Security_API"
		"vault")
		"TS29222_CAPIF_Logging_API_Invocation_API" "TS29222_CAPIF_Publish_Service_API" "TS29222_CAPIF_Routing_Info_API" "TS29222_CAPIF_Security_API")

		# Loop over service names
		for SERVICE in "${SERVICES[@]}"; do
		@@ -205,5 +204,11 @@ dev_build_and_push:
		- docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG .
		- docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG
		- echo "----------------------------------------------------"
		- echo "### build and push celery image###"
		- cd $TMP_PWD/services/celery/
		- docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/celery:$CI_COMMIT_REF_SLUG .
		- docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/celery:$CI_COMMIT_REF_SLUG
		- echo "----------------------------------------------------"

		- docker logout $CI_REGISTRY
		<<: *dev_common
		No newline at end of file

capif/templates/ci_staging.gitlab-ci.yml

+12 −2

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ staging_linting_docker:
		../hadolint --version

		# Array of service names
		SERVICES=("vault" "nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API"
		SERVICES=("celery" "nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API"
		"TS29222_CAPIF_API_Provider_Management_API" "TS29222_CAPIF_Auditing_API" "TS29222_CAPIF_Discover_Service_API" "TS29222_CAPIF_Events_API"
		"TS29222_CAPIF_Logging_API_Invocation_API" "TS29222_CAPIF_Publish_Service_API" "TS29222_CAPIF_Routing_Info_API" "TS29222_CAPIF_Security_API"
		"vault")
		@@ -160,7 +160,7 @@ staging_grype_cvs:
		echo "TMP_PWD=$TMP_PWD"

		# Array of image names
		IMAGE_NAMES=("nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API"
		IMAGE_NAMES=("nginx" "celery" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API"
		"TS29222_CAPIF_API_Provider_Management_API" "TS29222_CAPIF_Auditing_API" "TS29222_CAPIF_Discover_Service_API"
		"TS29222_CAPIF_Events_API" "TS29222_CAPIF_Logging_API_Invocation_API" "TS29222_CAPIF_Publish_Service_API"
		"TS29222_CAPIF_Routing_Info_API" "TS29222_CAPIF_Security_API" "vault")
		@@ -322,6 +322,11 @@ staging_build_and_push:
		- docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG .
		- docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG
		- echo "----------------------------------------------------"
		- echo "### build and push celery image###"
		- cd $TMP_PWD/services/celery/
		- docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG .
		- docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG
		- echo "----------------------------------------------------"
		- docker logout $CI_REGISTRY
		<<: *staging_common

		@@ -415,4 +420,9 @@ staging_build_and_push_mr:
		- docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG .
		- docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG
		- echo "----------------------------------------------------"
		- echo "### build and push celery image###"
		- cd $TMP_PWD/services/celery/
		- docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG .
		- docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG
		- echo "----------------------------------------------------"
		- docker logout $CI_REGISTRY
		No newline at end of file

capif/templates/cicd-deploy-release.gitlab-ci.yml

+6 −1

Original line number	Diff line number	Diff line
		@@ -110,6 +110,11 @@ prod_build_and_push:
		- docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/mock-server:$CI_COMMIT_TAG .
		- docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/mock-server:$CI_COMMIT_TAG
		- echo "----------------------------------------------------"
		- echo "### build and push celery image###"
		- cd $TMP_PWD/services/celery/
		- docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/mock-server:$CI_COMMIT_TAG .
		- docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/mock-server:$CI_COMMIT_TAG
		- echo "----------------------------------------------------"
		- docker logout $CI_REGISTRY


		@@ -144,7 +149,7 @@ deploy_ocf_prod:
		"ocf-api-provider-management" "ocf-auditing-api-logs"
		"ocf-discover-service-api" "ocf-events" "ocf-helper"
		"ocf-publish-service-api" "ocf-register" "ocf-routing-info"
		"ocf-security")
		"ocf-security" "celery")

		for chart in "${charts[@]}"; do
		yq e -i ".appVersion = \"$CI_COMMIT_TAG\"" "helm/capif/charts/$chart/Chart.yaml"