Commit a0a7820f authored by garciadeblas's avatar garciadeblas
Browse files

Fix script generate-packages.sh to generate packages explicitly 



Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>
parent ab40ec4e

.gitlab-ci.yml

+11 −6
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@ publish-repository: 
    - 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

    - ./generate_packages.sh

    - mkdir temp

    # - mv magma/* temp

    - mv *.tar.gz charm-packages/*.tar.gz temp

    - LC_ALL=C.UTF-8 LANG=C.UTF-8 osm -vvv repo-index --origin temp --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
@@ -46,9 +48,12 @@ build-local-repository: 
    - 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

    - ./generate_packages.sh

    - mkdir temp

    # - mv magma/* temp

    - mv *.tar.gz temp

    - mv charm-packages/*.tar.gz temp

    - LC_ALL=C.UTF-8 LANG=C.UTF-8 osm -vvv repo-index --origin temp --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

generate-packages.sh

+73 −2
Original line number Diff line number Diff line 
#!/bin/bash

set -eux

for d in *vnf; do

declare -a VNFPKG_LIST=(

    "affinity_basic_vnf"

    "ubuntu_cloudinit_vnf"

    "charm-packages/ha_proxy_charm_vnf"

    "charm-packages/k8s_proxy_charm_vnf"

    "charm-packages/native_charm_vnf"

    "charm-packages/native_k8s_charm_vnf"

    "charm-packages/native_k8s_scale_charm_vnf"

    "charm-packages/native_manual_scale_charm_vnf"

    "charm-packages/nopasswd_k8s_proxy_charm_vnf"

    "charm-packages/nopasswd_proxy_charm_vnf"

    "charm-packages/ns_relations_provides_vnf"

    "charm-packages/ns_relations_requires_vnf"

    "charm-packages/vnf_relations_vnf"

    "cirros_alarm_vnf"

    "epa_1vm_passthrough_vnf"

    "epa_1vm_sriov_vnf"

    "epa_quota_vnf"

    "hackfest_basic_metrics_vnf"

    "hackfest_basic_sriov_vnf"

    "hackfest_basic_vnf"

    "hackfest_cloudinit_vnf"

    "hackfest_multivdu_vnf"

    "ipprofile_2vm_vnf"

    "nscharm_policy_vnf"

    "nscharm_user_vnf"

    "openldap_knf"

    "openldap_primitives_knf"

    "openldap_scale_knf"

    "simple_2vm_vnf"

    "slice_basic_middle_vnf"

    "slice_basic_vnf"

    "snmp_ee_vnf"

    "ubuntu_4ifaces_vnf"

)

#for d in *vnf; do

for d in ${VNFPKG_LIST[@]}; do

    echo "osm package-build $d"

    osm package-build $d

done

for d in *ns; do



declare -a NSPKG_LIST=(

    "affinity_basic_ns"

    "charm-packages/ha_proxy_charm_ns"

    "charm-packages/k8s_proxy_charm_ns"

    "charm-packages/native_charm_ns"

    "charm-packages/native_k8s_charm_ns"

    "charm-packages/native_k8s_scale_charm_ns"

    "charm-packages/native_manual_scale_charm_ns"

    "charm-packages/nopasswd_k8s_proxy_charm_ns"

    "charm-packages/nopasswd_proxy_charm_ns"

    "charm-packages/ns_relations_ns"

    "charm-packages/vnf_relations_ns"

    "cirros_alarm_ns"

    "epa_1vm_passthrough_ns"

    "epa_1vm_sriov_ns"

    "epa_quota_ns"

    "hackfest_basic_metrics_ns"

    "hackfest_basic_ns"

    "hackfest_basic_sriov_ns"

    "hackfest_cloudinit_ns"

    "hackfest_multivdu_ns"

    "ipprofile_2vm_ns"

    "nscharm_ns"

    "openldap_ns"

    "simple_2vm_ns"

    "slice_basic_middle_ns"

    "slice_basic_ns"

    "snmp_ee_ns"

    "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

done