Commit ac5209e1 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/89-cttc-extend-gnmi-openconfig-sbi-driver
parents 316a807f 88b4d7c7

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ include: 
  #- local: '/src/telemetry/.gitlab-ci.yml'

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

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

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

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



  # This should be last one: end-to-end integration tests

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

deploy/crdb.sh

+2 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ function crdb_drop_databases_single() { 
            --execute "SHOW DATABASES;" --format=tsv | awk '{print $1}' | grep "^tfs"

    )

    echo "Found TFS databases: ${DATABASES}" | tr '\n' ' '

    echo



    for DB_NAME in $DATABASES; do

        echo "Dropping TFS database: $DB_NAME"
@@ -369,6 +370,7 @@ function crdb_drop_databases_cluster() { 
            --execute "SHOW DATABASES;" --format=tsv | awk '{print $1}' | grep "^tfs"

    )

    echo "Found TFS databases: ${DATABASES}" | tr '\n' ' '

    echo



    for DB_NAME in $DATABASES; do

        echo "Dropping TFS database: $DB_NAME"

deploy/tfs.sh

+1 −2
Original line number Diff line number Diff line
@@ -344,11 +344,10 @@ for COMPONENT in $TFS_COMPONENTS; do 
        VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-gateway:" "$MANIFEST" | cut -d ":" -f4)

        sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-gateway:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"

    else

        VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" | cut -d ":" -f4)

        if [ "$TFS_SKIP_BUILD" != "YES" ]; then

            IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')

            VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" | cut -d ":" -f4)

        else

            VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" | cut -d ":" -f4)

            IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT:$VERSION" | sed 's,//,/,g' | sed 's,http:/,,g')

        fi

        sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"

ecoc24

0 → 120000
+1 −0
Original line number Diff line number Diff line 
src/tests/ecoc24/
 
 No newline at end of file

manifests/analyticsservice.yaml

+2 −2
Original line number Diff line number Diff line
@@ -98,11 +98,11 @@ spec: 
  selector:

    app: analyticsservice

  ports:

    - name: frontend-grpc

    - name: grpc

      protocol: TCP

      port: 30080

      targetPort: 30080

    - name: backend-grpc

    - name: grpc-backend

      protocol: TCP

      port: 30090

      targetPort: 30090