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

Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into... 

Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into feat/404-cttc-multiple-enhancements-in-optical-controller
parents 4febfe15 23ae15fc

.gitlab-ci.yml

+8 −2
Original line number Diff line number Diff line
@@ -20,9 +20,15 @@ stages: 
  - unit_test

  - end2end_test



variables:

  CI_IMAGE_TAG: "candidate-${CI_COMMIT_SHORT_SHA}"

  TFS_REGISTRY_IMAGES: "${CI_REGISTRY_IMAGE}"

  TFS_IMAGE_TAG: "candidate-${CI_COMMIT_SHORT_SHA}"

  TFS_SKIP_BUILD: "YES"



workflow:

  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 == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'

      when: always

    - when: never
@@ -44,7 +50,7 @@ include: 
  - local: '/src/policy/.gitlab-ci.yml'

  - local: '/src/automation/.gitlab-ci.yml'

  - local: '/src/forecaster/.gitlab-ci.yml'

  #- local: '/src/webui/.gitlab-ci.yml'

  - local: '/src/webui/.gitlab-ci.yml'

  #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'

  #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'

  #- local: '/src/l3_attackmitigator/.gitlab-ci.yml'

manifests/opticalcontrollerservice.yaml

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ spec: 
      terminationGracePeriodSeconds: 5

      containers:

        - name: server

          image: localhost:32000/tfs/opticalcontroller:dev

          imagePullPolicy: Never

          image: labs.etsi.org:5050/tfs/controller/opticalcontroller:latest

          imagePullPolicy: Always

          ports:

            - containerPort: 10060

            - containerPort: 9192

proto/context.proto

+1 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ enum DeviceDriverEnum { 
  DEVICEDRIVER_GNMI_NOKIA_SRLINUX = 19;

  DEVICEDRIVER_OPENROADM = 20;

  DEVICEDRIVER_RESTCONF_OPENCONFIG = 21;

  DEVICEDRIVER_CUSTOM_IPOWDM = 22;

}



enum DeviceOperationalStatusEnum {

scripts/ci_apply_deploy_specs_overrides.sh

0 → 100755
+26 −0
Original line number Diff line number Diff line 
#!/usr/bin/env bash

# Copyright 2022-2026 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



# Source this after a deploy_specs*.sh file in GitLab CI jobs. Deploy specs

# intentionally contain final local values; CI overrides them explicitly here.

export CI_IMAGE_TAG="${CI_IMAGE_TAG:-candidate-${CI_COMMIT_SHORT_SHA}}"

export TFS_REGISTRY_IMAGES="${CI_REGISTRY_IMAGE}"

export TFS_IMAGE_TAG="${CI_IMAGE_TAG}"

export TFS_SKIP_BUILD="YES"



echo "CI deploy-spec overrides:"

echo "  TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES}"

echo "  TFS_IMAGE_TAG=${TFS_IMAGE_TAG}"

echo "  TFS_SKIP_BUILD=${TFS_SKIP_BUILD}"

scripts/ci_cleanup_gitlab_runner.sh

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ if [[ -f scripts/prune_old_mr_docker_images.sh ]]; then 
    bash scripts/prune_old_mr_docker_images.sh

fi



if [[ -f scripts/prune_old_candidate_docker_images.sh ]]; then

    bash scripts/prune_old_candidate_docker_images.sh

fi



if [[ "${CI_CLEANUP_CONTAINERLAB}" == "yes" ]] && command -v containerlab >/dev/null 2>&1; then

    containerlab destroy --all --cleanup || true

fi