From f4922fe3749027599aaf4c24eecb3ab046dd1ec9 Mon Sep 17 00:00:00 2001
From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Mon, 4 Dec 2023 13:04:17 +0100
Subject: [PATCH] Update .gitlab-ci to use ubuntu22 and fix osmclient
 installation

Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---
 .gitlab-ci.yml       | 26 +++++++++-----------------
 generate-packages.sh | 16 +++++++++++++---
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7321443a..8cf20a62 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +1,18 @@
 ###############################################################################
 publish-repository:
   # Builds the repository and pushes it to ftp site when a MR is accepted
-  image: ubuntu:18.04
+  image: ubuntu:22.04
   stage: deploy
   script:
     - DEBIAN_FRONTEND=noninteractive apt update
-    - DEBIAN_FRONTEND=noninteractive apt install -y gcc git make python3 python3 python3-pip python3-pycurl python3-setuptools sshpass software-properties-common libcurl4-openssl-dev libssl-dev
+    - DEBIAN_FRONTEND=noninteractive apt install -y gcc git make python3 python3 python3-pip python3-pycurl python3-setuptools sshpass software-properties-common
     - git submodule init
     - git submodule update
-    - python3 -m pip install wheel pyang pyangbind
-    - git clone https://osm.etsi.org/gerrit/osm/IM.git
-    - pip3 install -r IM/requirements.txt
-    - pip3 install IM/
     - git clone https://osm.etsi.org/gerrit/osm/osmclient.git
-    - pip3 install -r osmclient/requirements.txt
+    - pip3 install -r osmclient/requirements.txt -r osmclient/requirements-dev.txt
     - pip3 install osmclient/
-    - rm -rf osmclient/ IM/
-    - ./generate_packages.sh
+    - rm -rf osmclient/
+    - ./generate-packages.sh
     - mkdir temp
     # - mv magma/* temp
     - mv *.tar.gz charm-packages/*.tar.gz temp
@@ -33,22 +29,18 @@ publish-repository:
 build-local-repository:
   # Builds the repository locally but does not push if this is a new MR that
   # is still in development
-  image: python:latest
+  image: python:3.10
   stage: build
   script:
     - DEBIAN_FRONTEND=noninteractive apt update
     - DEBIAN_FRONTEND=noninteractive apt install -y gcc git make python3 python3 python3-pip python3-pycurl python3-setuptools sshpass software-properties-common wget
     - git submodule init
     - git submodule update
-    - python3 -m pip install wheel pyang pyangbind
-    - git clone https://osm.etsi.org/gerrit/osm/IM.git
-    - pip3 install -r IM/requirements.txt
-    - pip3 install IM/
     - git clone https://osm.etsi.org/gerrit/osm/osmclient.git
-    - pip3 install -r osmclient/requirements.txt
+    - pip3 install -r osmclient/requirements.txt -r osmclient/requirements-dev.txt
     - pip3 install osmclient/
-    - rm -rf osmclient/ IM/
-    - ./generate_packages.sh
+    - rm -rf osmclient/
+    - ./generate-packages.sh
     - mkdir temp
     # - mv magma/* temp
     - mv *.tar.gz temp
diff --git a/generate-packages.sh b/generate-packages.sh
index 819d0718..84e32640 100755
--- a/generate-packages.sh
+++ b/generate-packages.sh
@@ -2,7 +2,7 @@
 set -eux
 declare -a VNFPKG_LIST=(
     "affinity_basic_vnf"
-    "ubuntu_cloudinit_vnf"
+    "autoheal_vnf"
     "charm-packages/ha_proxy_charm_vnf"
     "charm-packages/k8s_proxy_charm_vnf"
     "charm-packages/native_charm_vnf"
@@ -13,6 +13,7 @@ declare -a VNFPKG_LIST=(
     "charm-packages/nopasswd_proxy_charm_vnf"
     "charm-packages/ns_relations_provides_vnf"
     "charm-packages/ns_relations_requires_vnf"
+    "charm-packages/pebble_charm_vnf"
     "charm-packages/vnf_relations_vnf"
     "cirros_alarm_vnf"
     "epa_1vm_passthrough_vnf"
@@ -24,18 +25,27 @@ declare -a VNFPKG_LIST=(
     "hackfest_cloudinit_vnf"
     "hackfest_multivdu_vnf"
     "ipprofile_2vm_vnf"
+    "ipv6profile_2vm_vnf"
+    "keep_persistent_volume_vnf"
+    "multivdu_multiattach_vnf"
+    "new_cirros_alarm_vnf"
     "nscharm_policy_vnf"
     "nscharm_user_vnf"
     "openldap_knf"
     "openldap_primitives_knf"
     "openldap_scale_knf"
+    "several_volumes_vnf"
     "simple_2vm_vnf"
+    "simple_ee_vnf"
     "slice_basic_middle_vnf"
     "slice_basic_vnf"
     "snmp_ee_vnf"
+    "sol004_hackfest_basic_vnf"
     "ubuntu_4ifaces_vnf"
+    "ubuntu_cloudinit_vnf"
+    "updated_simple_ee_vnf"
 )
-#for d in *vnf; do
+
 for d in ${VNFPKG_LIST[@]}; do
     echo "osm package-build $d"
     osm package-build $d
@@ -72,7 +82,7 @@ declare -a NSPKG_LIST=(
     "ubuntu_4ifaces_ns"
     "ubuntu_cloudinit_ns"
 )
-#for d in *ns; do
+
 for d in ${NSPKG_LIST[@]}; do
     echo "osm package-build $d"
     osm package-build $d
-- 
GitLab