Commit 05d63a77 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'develop' into 'main' 

docs update

See merge request !2
parents 64d0ca5b f9039dad

.gitlab-ci.yml

0 → 100644
+82 −0
Original line number Diff line number Diff line 
include:

  - project: osl/code/org.etsi.osl.main

    ref: main

    file: 

      - ci-templates/default.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME == "main"'

  

  - project: osl/code/org.etsi.osl.main

    ref: develop

    file: 

      - ci-templates/default.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME == "develop"'



  - project: osl/code/org.etsi.osl.main

    ref: $CI_COMMIT_REF_NAME

    file: 

      - ci-templates/default.yml

    rules:

      - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'



  - project: osl/code/org.etsi.osl.main

    ref: develop

    file: 

      - ci-templates/default.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED == "false"'





docker_build_api:

  extends: .default

  stage: build

  image:

    name: gcr.io/kaniko-project/executor:debug

    entrypoint: [""]

  script:

    - export DOCKER_TAG=$APP_VERSION

    - |

      if [ "$CI_COMMIT_REF_NAME" = "main" ]; then

        echo "Pushing Docker image with tag 'latest'"

        export DOCKER_TAG=latest

      fi

    - |

      if [ $CI_COMMIT_REF_PROTECTED == "false" ]; then

        echo "Setting env variable KANIKO_NO_PUSH to true"

        export KANIKO_NO_PUSH=true

      fi

    - /kaniko/executor --context "${CI_PROJECT_DIR}/QoDProvisioning/QoDProvisioningAPI/API" --dockerfile "${CI_PROJECT_DIR}/QoDProvisioning/QoDProvisioningAPI/API/Dockerfile" --destination "${CI_REGISTRY_IMAGE}/qodprovisioning/api:$APP_VERSION"



docker_build_operator:

  extends: .default

  stage: build

  image:

    name: gcr.io/kaniko-project/executor:debug

    entrypoint: [""]

  script:

    - export DOCKER_TAG=$APP_VERSION

    - |

      if [ "$CI_COMMIT_REF_NAME" = "main" ]; then

        echo "Pushing Docker image with tag 'latest'"

        export DOCKER_TAG=latest

      fi

    - |

      if [ $CI_COMMIT_REF_PROTECTED == "false" ]; then

        echo "Setting env variable KANIKO_NO_PUSH to true"

        export KANIKO_NO_PUSH=true

      fi

    - /kaniko/executor --context "${CI_PROJECT_DIR}/QoDProvisioning/QoDProvisioningAPI/Operator" --dockerfile "${CI_PROJECT_DIR}/QoDProvisioning/QoDProvisioningAPI/Operator/Dockerfile" --destination "${CI_REGISTRY_IMAGE}/qodprovisioning/operator:$APP_VERSION"





# docker_build_dry_run:

#   extends: .default

#   stage: build

#   image:

#     name: gcr.io/kaniko-project/executor:debug

#     entrypoint: [""]

#   script:

#     - /kaniko/executor --context "${CI_PROJECT_DIR}/QoDProvisioning/QoDProvisioningAPI/API" --dockerfile "${CI_PROJECT_DIR}/QoDProvisioning/QoDProvisioningAPI/API/Dockerfile" --destination "${CI_REGISTRY_IMAGE}.qodprovisioning.api:$APP_VERSION" --no-push

#     - /kaniko/executor --context "${CI_PROJECT_DIR}/QoDProvisioning/QoDProvisioningAPI/Operator" --dockerfile "${CI_PROJECT_DIR}/QoDProvisioning/QoDProvisioningAPI/Operator/Dockerfile" --destination "${CI_REGISTRY_IMAGE}.qodprovisioning.operator:$APP_VERSION" --no-push

#   rules:

#       - if: '$CI_COMMIT_REF_PROTECTED == "false"'

Documentation/CAMARAaaS-Architecture.png

−309 KiB (169 KiB)
Loading image diff...

QoDProvisioning/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ describe-dummy-operator-cr: 


# CAMARAaaS QoD Provisioning API

build-api-docker-image:

	docker build -t $(API_DOCKER_IMAGE_LOCAL_NAME):$(API_DOCKER_IMAGE_LOCAL_TAG) ./QoDProvisioningAPI/API

	docker build --no-cache -t $(API_DOCKER_IMAGE_LOCAL_NAME):$(API_DOCKER_IMAGE_LOCAL_TAG) ./QoDProvisioningAPI/API



tag-api-docker-image:

	docker tag $(API_DOCKER_IMAGE_LOCAL_NAME):$(API_DOCKER_IMAGE_LOCAL_TAG) $(REPOSITORY_HOST)/$(API_DOCKER_IMAGE_NAME_ON_REPOSITORY):$(API_DOCKER_IMAGE_TAG_ON_REPOSITORY)
@@ -49,7 +49,7 @@ api-docker-image: build-api-docker-image tag-api-docker-image push-api-docker-im 


# CAMARAaaS QoD Provisioning API Operator

build-operator-docker-image:

	docker build -t $(OPERATOR_DOCKER_IMAGE_LOCAL_NAME):$(OPERATOR_DOCKER_IMAGE_LOCAL_TAG) ./QoDProvisioningAPI/Operator

	docker build --no-cache -t $(OPERATOR_DOCKER_IMAGE_LOCAL_NAME):$(OPERATOR_DOCKER_IMAGE_LOCAL_TAG) ./QoDProvisioningAPI/Operator



tag-operator-docker-image:

	docker tag $(OPERATOR_DOCKER_IMAGE_LOCAL_NAME):$(OPERATOR_DOCKER_IMAGE_LOCAL_TAG) $(REPOSITORY_HOST)/$(OPERATOR_DOCKER_IMAGE_NAME_ON_REPOSITORY):$(OPERATOR_DOCKER_IMAGE_TAG_ON_REPOSITORY)

QoDProvisioning/QoDProvisioningAPI/API/src/main.py

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ from routers.qod_provisioning_router import router as QoDProvisioningApiRouter 
from routers.osl import router as OSLRouter



from database.db import init_db, get_db

from aux.service_event_manager.service_event_manager import ServiceEventManager

from aux.service_event_manager.camara_results_processor import CamaraResultsProcessor

from utils.service_event_manager.service_event_manager import ServiceEventManager

from utils.service_event_manager.camara_results_processor import CamaraResultsProcessor

from config import Config



# Set up logging

QoDProvisioning/QoDProvisioningAPI/API/src/routers/osl.py

+3 −3
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ from schemas.retrieve_provisioning_by_device import RetrieveProvisioningByDevice 
from schemas.status import Status

from schemas.status_info import StatusInfo

from database import crud

from aux import mappers

from utils import mappers

from datetime import datetime

import logging

from aux.service_event_manager.service_event_manager import ServiceEventManager

from utils.service_event_manager.service_event_manager import ServiceEventManager

import json

from config import Config

from aux.constants import Constants

from utils.constants import Constants

# Set up logging

logger = Config.setup_logging()