Skip to content
Snippets Groups Projects
Commit fb918b78 authored by garciadeblas's avatar garciadeblas
Browse files

Merge remote-tracking branch 'origin/master' into hackfest_multivdu

parents b535efcc 562b513c
No related branches found
No related tags found
1 merge request!143Updated hackfest_multivdu_vnf: changed image from US1604 to ubuntu20.04
Pipeline #383 passed with stage
Stage:
    in 1 minute and 36 seconds
    This commit is part of merge request !143. Comments created here will be created in the context of that merge request.
    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 10 additions and 10 deletions
    .gitlab-ci.yml
    + 10
    − 10
    View file @ fb918b78
    ...@@ -18,11 +18,11 @@ publish-repository: ...@@ -18,11 +18,11 @@ publish-repository:
    - rm -rf osmclient/ IM/ - rm -rf osmclient/ IM/
    - mv magma/* . - mv magma/* .
    - mv charm-packages/* . - mv charm-packages/* .
    - LC_ALL=C.UTF-8 oLANG=C.UTF-8 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 # sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P 29419 osmsupport@vnf-catalog.etsi.org << EOF
    put -r vnf-catalog/* Testing # put -r vnf-catalog/* Testing
    EOF # EOF
    rules: rules:
    - if: '$CI_COMMIT_REF_PROTECTED == "true"' - if: '$CI_COMMIT_REF_PROTECTED == "true"'
    when: on_success when: on_success
    ...@@ -48,11 +48,11 @@ build-local-repository: ...@@ -48,11 +48,11 @@ build-local-repository:
    - rm -rf osmclient/ IM/ - rm -rf osmclient/ IM/
    - mv magma/* . - mv magma/* .
    - mv charm-packages/* . - mv charm-packages/* .
    - LC_ALL=C.UTF-8 oLANG=C.UTF-8 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 # sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P 29419 osmsupport@vnf-catalog.etsi.org << EOF
    put -r vnf-catalog/* Testing/Premerge # put -r vnf-catalog/* Testing/Premerge
    EOF # EOF
    rules: rules:
    - if: '$CI_COMMIT_REF_PROTECTED == "false"' - if: '$CI_COMMIT_REF_PROTECTED == "false"'
    when: on_success when: on_success
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment