Commit f6edc897 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent f9c1377c

manifests/monitoringservice.yaml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ spec: 
        - containerPort: 9192

        env:

        - name: LOG_LEVEL

          value: "DEBUG"

          value: "INFO"

        envFrom:

        - secretRef:

            name: qdb-data

my_deploy.sh

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"



# Set the list of components, separated by spaces, you want to build images for, and deploy.

export TFS_COMPONENTS="context device automation monitoring pathcomp service slice compute webui load_generator policy"

export TFS_COMPONENTS="context device automation monitoring pathcomp service slice compute webui load_generator"



# Set the tag you want to use for your images.

export TFS_IMAGE_TAG="dev"

src/policy/.gitlab-ci.yml

+18 −18
Original line number Diff line number Diff line
@@ -79,21 +79,21 @@ unit_test policy: 
        - manifests/${IMAGE_NAME_POLICY}service.yaml

        - .gitlab-ci.yml



# Deployment of policy service in Kubernetes Cluster

deploy policy:

  stage: deploy

  needs:

    - build policy

    - unit_test policy

  script:

    - kubectl version

    - kubectl get all

    - kubectl delete --ignore-not-found=true -f "manifests/policyservice.yaml"

    - kubectl apply -f "manifests/policyservice.yaml"

    - kubectl delete pods --selector app=policyservice

    - kubectl get all

  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'

      when: manual

    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'

      when: manual
 
 No newline at end of file
 
## Deployment of policy service in Kubernetes Cluster

#deploy policy:

#  stage: deploy

#  needs:

#    - build policy

#    - unit_test policy

#  script:

#    - kubectl version

#    - kubectl get all

#    - kubectl delete --ignore-not-found=true -f "manifests/policyservice.yaml"

#    - kubectl apply -f "manifests/policyservice.yaml"

#    - kubectl delete pods --selector app=policyservice

#    - kubectl get all

#  rules:

#    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'

#      when: manual

#    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'

#      when: manual
 
 No newline at end of file