From f2733e135a4a132b8163d90acdccec46b76de283 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 23 Oct 2025 16:10:31 +0200 Subject: [PATCH 1/2] Update .gitlab-ci.yml to install rsync in publish tasks Signed-off-by: garciadeblas --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb04c05..e88859a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,7 +50,7 @@ publish-testing-repository: dependencies: - build-local-repository # Reuses artifacts generated in build los artefactos generados en build script: - - apt update && apt install -y sshpass + - apt update && apt install -y rsync - | set -e echo "Uploading catalog to Rsync server / Testing ..." @@ -71,7 +71,7 @@ publish-ondemand-repository: dependencies: - build-local-repository script: - - apt update && apt install -y sshpass + - apt update && apt install -y rsync - | set -e DESTINATION_FOLDER="${ONDEMAND_DESTINATION_FOLDER:-Stable}" @@ -82,4 +82,4 @@ publish-ondemand-repository: allow_failure: true environment: name: production - url: "https://osm.etsi.org/vnf-catalog/$DESTINATION_FOLDER" + url: "https://osm.etsi.org/vnf-catalog/${ONDEMAND_DESTINATION_FOLDER:-Stable}" -- GitLab From c016d5f0c425af01486c58c062cfeeff86d723ce Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 23 Oct 2025 17:45:30 +0200 Subject: [PATCH 2/2] Update .gitlab-ci.yml to follow osmclient installation as done in OSM installation Signed-off-by: garciadeblas --- .gitlab-ci.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e88859a..3a02bee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,18 +8,23 @@ variables: RSYNC_SERVER: "vnf-catalog.etsi.org::rsyncosm/" RSYNC_USER: "osmsupport" ONDEMAND_DESTINATION_FOLDER: "Stable" + OSM_IM_VERSION: "master" ############################################################################### # Anchor definition with common commands ############################################################################### .default-script: &default_script - - apt update && apt install -y gcc git make python3 python3 python3-pip python3-pycurl python3-setuptools software-properties-common wget + - apt-get update && apt-get install -y gcc git make python3 python3 python3-pip python3-pycurl python3-setuptools software-properties-common wget curl libmagic1 - git submodule init - git submodule update - - git clone https://osm.etsi.org/gerrit/osm/osmclient.git - - pip3 install --user -r osmclient/requirements.txt -r osmclient/requirements-dev.txt - - pip3 install --user osmclient/ - - rm -rf osmclient/ + - git clone --filter=blob:none --tags https://osm.etsi.org/gerrit/osm/IM.git /tmp/osm-im + - git -C /tmp/osm-im fetch origin + - git -C /tmp/osm-im checkout ${OSM_IM_VERSION} + - pip install --no-cache-dir -r /tmp/osm-im/requirements.txt && \ + - pip install /tmp/osm-im + - export PATH=$HOME/.local/bin:${PATH} + - pip install -r "https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master" + - pip install git+https://osm.etsi.org/gerrit/osm/osmclient.git@master#egg=osmclient - ./generate-packages.sh - mkdir temp # - mv magma/* temp @@ -50,7 +55,7 @@ publish-testing-repository: dependencies: - build-local-repository # Reuses artifacts generated in build los artefactos generados en build script: - - apt update && apt install -y rsync + - apt-get update && apt-get install -y rsync - | set -e echo "Uploading catalog to Rsync server / Testing ..." @@ -71,7 +76,7 @@ publish-ondemand-repository: dependencies: - build-local-repository script: - - apt update && apt install -y rsync + - apt-get update && apt-get install -y rsync - | set -e DESTINATION_FOLDER="${ONDEMAND_DESTINATION_FOLDER:-Stable}" -- GitLab