From d82cdfb3264d690d49f441b033b927c5d36a6b45 Mon Sep 17 00:00:00 2001
From: gomezchavez <guillermo.gomez.external@atos.net>
Date: Fri, 3 Sep 2021 10:07:45 +0200
Subject: [PATCH] refactoring of gitlab-ci and use of osmclient repo-index for
testing
---
.gitlab-ci.yml | 63 +++++++++++++++++++++++---------------------------
1 file changed, 29 insertions(+), 34 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9310c287..adac3553 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,58 +1,53 @@
###############################################################################
-publish-repository:
- # Builds the repository and pushes it to ftp site when a MR is accepted
- image: ubuntu:18.04
- stage: deploy
- script:
+stages:
+ - build_and_test
+ - deploy
+
+before_script: # TODO: how to reuse installation?
- 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 libcurl4-openssl-dev libssl-dev 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
+ - git clone https://osm.etsi.org/gerrit/osm/osmclient.git@a06653517f253a15b10914d067c95d163f734ac2
- pip3 install -r osmclient/requirements.txt
- pip3 install osmclient/
- rm -rf osmclient/ IM/
- mv magma/* .
- mv charm-packages/* .
- # - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm -vvv repo-index --origin . --destination vnf-catalog
- # - |
- # sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P 29419 osmsupport@vnf-catalog.etsi.org << EOF
- # put -r vnf-catalog/* Testing
- # EOF
- rules:
- - if: '$CI_COMMIT_REF_PROTECTED == "true"'
- when: on_success
+
###############################################################################
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
- stage: build
+ image: ubuntu:18.04
+ stage: build_and_test
+ only:
+ - merge_requests
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 osmclient/
- - rm -rf osmclient/ IM/
- - mv magma/* .
- - mv charm-packages/* .
+ - echo "Build OK"
+ - osm -vvv repo-index --origin . --destination vnf-catalog
# - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm -vvv repo-index --origin . --destination vnf-catalog
# - |
# sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P 29419 osmsupport@vnf-catalog.etsi.org << EOF
# put -r vnf-catalog/* Testing/Premerge
# EOF
- rules:
- - if: '$CI_COMMIT_REF_PROTECTED == "false"'
- when: on_success
+
+
+publish-repository:
+ # Builds the repository and pushes it to ftp site when a MR is accepted # TODO: how is it pushed?
+ image: ubuntu:18.04
+ stage: deploy
+ only:
+ - master
+ script:
+ - echo "Build OK"
+ # - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm -vvv repo-index --origin . --destination vnf-catalog
+ # - |
+ # sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P 29419 osmsupport@vnf-catalog.etsi.org << EOF
+ # put -r vnf-catalog/* Testing
+ # EOF
--
GitLab