Commit 0bff35fd authored by Mark Beierl's avatar Mark Beierl
Browse files

Merge branch 'beierlm-master-patch-43982' into 'master' 

Use osmclient from source

See merge request !100
parents a65e0e50 74ea852a

.gitlab-ci.yml

+17 −15
Original line number Diff line number Diff line
@@ -5,17 +5,18 @@ 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

    - 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
@@ -28,21 +29,22 @@ 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

    - 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

    - 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