Commit 77f71115 authored by Nikos Psaromanolakis's avatar Nikos Psaromanolakis
Browse files

Merge changes from main

parents 8bcbbd7a 754699a0

.gitlab-ci.yml

+4 −5
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ get_images: 
      REGISTRY_API=$(curl --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" --url $REGISTRY_API_URL | jq -r '.[].location'  | grep -E '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1)

    - |

      FABRIC_API=$(curl --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" --url $FABRIC_API_URL | jq -r '.[].location'  | grep -E '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1)

    #- |

    #  PORTAL=$(curl --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" --url $PORTAL_URL | jq -r '.[].location'  | grep -E '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1)  

    - |

      PORTAL=$(curl --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" --url $PORTAL_URL | jq -r '.[].location'  | grep -E '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1)  

    - echo "TMF_API=$TMF_API" > build.env 

    - echo "SONATA=$SONATA" >> build.env

    - echo "PKG_MANAGER=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.core/pkg-manager.helm/pkg-manager:latest" >> build.env
@@ -69,7 +69,7 @@ get_images: 
    - echo "PEERING_API=$PEERING_API" >> build.env

    - echo "REGISTRY_API=$REGISTRY_API" >> build.env

    - echo "FABRIC_API=$FABRIC_API" >> build.env

    - echo "PORTAL=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.portal/web/hypo-portal:latest" >> build.env

    - echo "PORTAL=$PORTAL" >> build.env

  artifacts:

    paths:

      - build.env
@@ -131,7 +131,6 @@ update_values: 


package_publish:

  stage: package_publish

  allow_failure: true

  image:

    name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/alpine/helm:3.17.2

    entrypoint: [""]
@@ -145,7 +144,7 @@ package_publish: 
  before_script:

    - git fetch origin

    - git reset --hard origin/main

    - helm registry login -u "${HELM_REGISTRY_USER}" -p "${HELM_REGISTRY_PASSWORD}" registry.ubitech.eu

    - helm registry login -u "${HELM_REGISTRY_USER}" -p "${HELM_REGISTRY_PASSWORD}" labs.etsi.org:5050

    - helm plugin install --version=v0.9.0 https://github.com/chartmuseum/helm-push.git

    #- source skip.env

  script:

charts/hypo/Chart.yaml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ type: application 
# This is the chart version. This version number should be incremented each time you make changes

# to the chart and its templates, including the app version.

# Versions are expected to follow Semantic Versioning (https://semver.org/)

version: '2026.6.1'

version: '2026.6.2'



# This is the version number of the application being deployed. This version number should be

# incremented each time you make changes to the application. Versions are not expected to

charts/hypo/values.yaml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ portal: 
    repository: 

      labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.portal/web/hypo-portal

    pullPolicy: Always

    tag: "latest"

    tag: "1.0.0"



  imagePullSecrets:

  - name: regcred