Commit 50f12a08 authored by garciaale's avatar garciaale
Browse files

Merges branch master into SOL006 



Signed-off-by: default avatargarciaale <agarcia@whitestack.com>
parents 876df883 17583c8b

.gitlab-ci.yml

+27 −15
Original line number Diff line number Diff line
@@ -5,14 +5,18 @@ publish-repository: 
  stage: deploy

  script:

    - DEBIAN_FRONTEND=noninteractive apt update

    - DEBIAN_FRONTEND=noninteractive apt install -y python3-pip sshpass software-properties-common wget

    - 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

    - 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 IM/

    - git clone https://osm.etsi.org/gerrit/osm/osmclient.git

    - pip3 install osmclient/

    - rm -rf osmclient/ IM/

    - mv magma/* .

    - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm repo-index --origin . --destination vnf-catalog

    - 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
@@ -25,18 +29,26 @@ 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 python3-pip sshpass software-properties-common wget

    - 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

    - 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 IM/

    - git clone https://osm.etsi.org/gerrit/osm/osmclient.git

    - pip3 install osmclient/

    - rm -rf osmclient/ IM/

    - mv magma/* .

    - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm repo-index --origin . --destination vnf-catalog

    - 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/Premerge

        EOF

  rules:

    - if: '$CI_COMMIT_REF_PROTECTED == "false"'

      when: on_success

.gitmodules

+0 −3
Original line number Diff line number Diff line 
[submodule "magma/hackfest_magma-agw-enb_vnfd/charms/enodeb/mod/operator"]

	path = magma/hackfest_magma-agw-enb_vnfd/charms/enodeb/mod/operator

	url = https://github.com/canonical/operator

[submodule "magma/hackfest_magma-agw-enb_vnfd/charms/magmagw/mod/operator"]

	path = magma/hackfest_magma-agw-enb_vnfd/charms/magmagw/mod/operator

	url = https://github.com/canonical/operator

magma/hackfest_magma-agw-enb_vnfd/charms/enodeb/README.md

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
# EnodeB Charm



This is a native charm used by Open Source Mano (OSM) to add day-2 primitive to an enodeB + radio emulator, written in the [Python Operator Framwork](https://github.com/canonical/operator)

magma/hackfest_magma-agw-enb_vnfd/charms/enodeb/config.yaml

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
options: {}

magma/hackfest_magma-agw-enb_vnfd/charms/enodeb/hooks/install

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../src/charm.py
 
 No newline at end of file