From 31133679d35f72dd6c47e87055f7272ae88151a2 Mon Sep 17 00:00:00 2001 From: beierlm Date: Fri, 27 Nov 2020 21:29:27 +0100 Subject: [PATCH 1/8] Use osmclient from source Changes from latest published package of the osmclient to building the latest from source --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20c7b0c6..b0a65b3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,14 +32,14 @@ build-local-repository: stage: build script: - DEBIAN_FRONTEND=noninteractive apt update - - DEBIAN_FRONTEND=noninteractive apt install -y git python3-pip sshpass software-properties-common wget + - 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 python-magic pyangbind verboselogs - - wget -qO - https://osm-download.etsi.org/repository/osm/debian/ReleaseEIGHT/OSM%20ETSI%20Release%20Key.gpg | apt-key add - - - add-apt-repository -y "deb [arch=amd64] https://osm-download.etsi.org/repository/osm/debian/ReleaseEIGHT stable devops IM osmclient" - - DEBIAN_FRONTEND=noninteractive apt update - - DEBIAN_FRONTEND=noninteractive apt install -y python3-osmclient + - python3 -m pip install wheel pyang pyangbind + - mkdir build ; cd build ; git clone https://osm.etsi.org/gerrit/osm/IM.git + - cd build/IM pip3 install . + - cd build ; git clone https://osm.etsi.org/gerrit/osm/osmclient.git + - cd build/osmclient pip3 install . - mv magma/* . - mv charm-packages/* . - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm repo-index --origin . --destination vnf-catalog -- GitLab From 0a616035da49dafdfae5fd2689f5fa379c7474fa Mon Sep 17 00:00:00 2001 From: beierlm Date: Fri, 27 Nov 2020 21:33:22 +0100 Subject: [PATCH 2/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0a65b3f..1da1311f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,9 +37,9 @@ build-local-repository: - git submodule update - python3 -m pip install wheel pyang pyangbind - mkdir build ; cd build ; git clone https://osm.etsi.org/gerrit/osm/IM.git - - cd build/IM pip3 install . + - cd build/IM ; pip3 install . - cd build ; git clone https://osm.etsi.org/gerrit/osm/osmclient.git - - cd build/osmclient pip3 install . + - cd build/osmclient ; pip3 install . - mv magma/* . - mv charm-packages/* . - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm repo-index --origin . --destination vnf-catalog -- GitLab From 2dd51e4432e56313a7750254a45dcf2a8a9e432a Mon Sep 17 00:00:00 2001 From: beierlm Date: Fri, 27 Nov 2020 21:35:51 +0100 Subject: [PATCH 3/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1da1311f..19f39513 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,6 +37,8 @@ build-local-repository: - git submodule update - python3 -m pip install wheel pyang pyangbind - mkdir build ; cd build ; git clone https://osm.etsi.org/gerrit/osm/IM.git + - ls -al + - ls -al build - cd build/IM ; pip3 install . - cd build ; git clone https://osm.etsi.org/gerrit/osm/osmclient.git - cd build/osmclient ; pip3 install . -- GitLab From 84db569dd26e0c6bcd8e67b0a971cb9a23bc9140 Mon Sep 17 00:00:00 2001 From: beierlm Date: Fri, 27 Nov 2020 21:38:41 +0100 Subject: [PATCH 4/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19f39513..15e5b6ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,12 +36,10 @@ build-local-repository: - git submodule init - git submodule update - python3 -m pip install wheel pyang pyangbind - - mkdir build ; cd build ; git clone https://osm.etsi.org/gerrit/osm/IM.git - - ls -al - - ls -al build - - cd build/IM ; pip3 install . - - cd build ; git clone https://osm.etsi.org/gerrit/osm/osmclient.git - - cd build/osmclient ; pip3 install . + - git clone https://osm.etsi.org/gerrit/osm/IM.git + - pip3 install IM + - git clone https://osm.etsi.org/gerrit/osm/osmclient.git + - pip3 install osmclient - mv magma/* . - mv charm-packages/* . - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm repo-index --origin . --destination vnf-catalog -- GitLab From 19946b29c951b453e18aacbe4e82a2abd01bb819 Mon Sep 17 00:00:00 2001 From: beierlm Date: Fri, 27 Nov 2020 21:44:18 +0100 Subject: [PATCH 5/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15e5b6ab..ae6d07b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ 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: ubuntu:18.04 + image: python:latest stage: build script: - DEBIAN_FRONTEND=noninteractive apt update -- GitLab From fb93e14e757db322269b345321f2d849bdd6252d Mon Sep 17 00:00:00 2001 From: beierlm Date: Fri, 27 Nov 2020 21:56:43 +0100 Subject: [PATCH 6/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae6d07b0..7c569105 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,9 +37,9 @@ build-local-repository: - git submodule update - python3 -m pip install wheel pyang pyangbind - git clone https://osm.etsi.org/gerrit/osm/IM.git - - pip3 install IM + - pip3 install IM/ - git clone https://osm.etsi.org/gerrit/osm/osmclient.git - - pip3 install osmclient + - pip3 install osmclient/ - mv magma/* . - mv charm-packages/* . - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm repo-index --origin . --destination vnf-catalog -- GitLab From 50424052d2f1d62b309666b84637e87413871ecc Mon Sep 17 00:00:00 2001 From: beierlm Date: Fri, 27 Nov 2020 21:58:47 +0100 Subject: [PATCH 7/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c569105..252c6a9f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,14 +5,15 @@ publish-repository: stage: deploy script: - DEBIAN_FRONTEND=noninteractive apt update - - DEBIAN_FRONTEND=noninteractive apt install -y git python3-pip sshpass software-properties-common wget + - 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 python-magic pyangbind verboselogs - - wget -qO - https://osm-download.etsi.org/repository/osm/debian/ReleaseEIGHT/OSM%20ETSI%20Release%20Key.gpg | apt-key add - - - add-apt-repository -y "deb [arch=amd64] https://osm-download.etsi.org/repository/osm/debian/ReleaseEIGHT stable devops IM osmclient" - - DEBIAN_FRONTEND=noninteractive apt update - - DEBIAN_FRONTEND=noninteractive apt install -y python3-osmclient + - python3 -m pip install wheel pyang pyangbind + - git clone https://osm.etsi.org/gerrit/osm/IM.git + - pip3 install IM/ + - git clone https://osm.etsi.org/gerrit/osm/osmclient.git + - pip3 install osmclient/ + - rm -rf osmclient/ IM/ - mv magma/* . - mv charm-packages/* . - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm repo-index --origin . --destination vnf-catalog @@ -40,6 +41,7 @@ build-local-repository: - pip3 install IM/ - git clone https://osm.etsi.org/gerrit/osm/osmclient.git - pip3 install osmclient/ + - rm -rf osmclient/ IM/ - mv magma/* . - mv charm-packages/* . - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm repo-index --origin . --destination vnf-catalog -- GitLab From d10784f42e6e9105fd4ee90f3e47b5ece70634d1 Mon Sep 17 00:00:00 2001 From: beierlm Date: Fri, 27 Nov 2020 21:59:14 +0100 Subject: [PATCH 8/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 252c6a9f..54251c75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ publish-repository: - rm -rf osmclient/ IM/ - mv magma/* . - mv charm-packages/* . - - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm 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 @@ -44,7 +44,7 @@ build-local-repository: - rm -rf osmclient/ IM/ - mv magma/* . - mv charm-packages/* . - - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm repo-index --origin . --destination vnf-catalog + - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm -vvv repo-index --origin . --destination vnf-catalog rules: - if: '$CI_COMMIT_REF_PROTECTED == "false"' when: on_success -- GitLab