Commit 545beb1f authored by Jan Kiene's avatar Jan Kiene
Browse files

back to old default and use source for scripts 

scripts that intend to modify env vars need to be run with source
parent ec9eb559

.gitlab-ci.yml

+5 −4
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ workflow: 


# From float CI

.merge-request-comparison-setup-codec: &merge-request-comparison-setup-codec

  - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-merge-target-binaries.sh

  - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-merge-target-binaries.sh



  # need to rename to match the conventions for the renderer tests...

  - mv $MERGE_TARGET_ENCODER_PATH $REF_ENCODER_PATH
@@ -422,11 +422,12 @@ workflow: 
    - fi



    # set branches for reference builds

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/set-float-reference-branches.sh

    - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/set-float-reference-branches.sh

    - echo "$FLOAT_REF_BRANCH - $FLOAT_REF_BRANCH_MERGE_SOURCE - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME - $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"

    # build merge target branch and correpsonding float reference

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh float-ref

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-merge-target-binaries.sh

    - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-merge-target-binaries.sh

    - echo "$FLOAT_REF_BRANCH - $FLOAT_REF_BRANCH_MERGE_SOURCE - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME - $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"

    # build to-be-merged branch and corresponding float ref branch

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh merge-source

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh float-ref-merge-source
@@ -561,7 +562,7 @@ workflow: 
    - comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING"



    # set branches for reference builds

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/set-float-reference-branches.sh

    - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/set-float-reference-branches.sh

    # build merge target branch and correpsonding float reference

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh float-ref

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh merge-target

.gitlab-ci/variables.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ variables: 
  LTV_DIR: "/usr/local/ltv"

  EVS_BE_TEST_DIR_BASOP: "/usr/local/be_2_evs_basop"

  FLOAT_REF_BRANCH: "ivas-float-update"

  FLOAT_REF_BRANCH_MERGE_SOURCE: "float-pc"

  FLOAT_REF_BRANCH_MERGE_SOURCE: ""

  BUILD_OUTPUT: "build_output.txt"

  SCRIPTS_DIR: "/usr/local/scripts"

  EXIT_CODE_NON_BE: 123