Commit e921cfca authored by Jan Kiene's avatar Jan Kiene
Browse files

cleanup some remains of ivas-float-update branch

parent 6be4f848

README.md

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ include: 
    file: main-basop.yml

```



This way, any CI change can be developed centrally in this repository and does not need to be merged/ported to different repositories/branches (e.g. keeping ivas-basop main and ivas-float-update in synch).

This way, any CI change can be developed centrally in this repository and does not need to be merged/ported to different repositories/branches.



### Adding new CI code

includes/default-variables-basop.yml

+0 −1
Original line number Diff line number Diff line 
variables:

  EVS_BE_TEST_DIR_BASOP: "/usr/local/be_2_evs_basop"

  # TODO: cleanup and use global var defined in ivas-codec-ci

  FLOAT_REF_BRANCH: "ivas-float-update"

  FLOAT_REF_BRANCH_MERGE_SOURCE: ""

  SCRIPTS_DIR: "/usr/local/scripts"

  LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --param_file scripts/config/self_test_ltv.prm --use_ltv"

main-basop.yml

+14 −26
Original line number Diff line number Diff line
@@ -129,12 +129,6 @@ workflow: 
    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never



.rules-merge-request-to-float-ref:

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "ivas-float-update"

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never



.rules-merge-request-to-main-no-draft:

  rules:

    - if: $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/
@@ -143,14 +137,6 @@ workflow: 
    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never



.rules-merge-request-to-float-ref-no-draft:

  rules:

    - if: $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/

      when: never

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "ivas-float-update"

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never



.rules-pytest-to-ref-pre:

  rules:

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "ivas-conformance-linux"
@@ -1470,10 +1456,11 @@ split-rendering-pytest-on-merge-request: 
        - $REPORT_XML



# test that runs all modes with 1s input signals

codec-smoke-test:

# TODO: adapt for BASOP

.codec-smoke-test:

  extends:

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request-to-float-ref-no-draft

    - .rules-merge-request-to-main-no-draft

  timeout: "20 minutes"

  stage: test

  needs: ["build-codec-linux-make"]
@@ -1515,7 +1502,7 @@ codec-smoke-test: 
check-first-frame-is-sid:

  extends:

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request-to-float-ref-no-draft

    - .rules-merge-request-to-main-no-draft

  stage: test

  needs: ["build-codec-linux-make"]

  script:
@@ -1560,7 +1547,7 @@ check-first-frame-is-sid: 
ivas-interop-on-merge-request:

  extends:

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request-to-float-ref-no-draft

    - .rules-merge-request-to-main-no-draft

    - .test-job-linux-compares-to-fixed-target

  stage: test

  timeout: "10 minutes"
@@ -1654,10 +1641,11 @@ lc3-wrapper-unit-test: 


# from float

# test renderer executable

renderer-smoke-test:

# TODO: adapt for BASOP

.renderer-smoke-test:

  extends:

    - .test-job-linux

    - .rules-merge-request-to-float-ref-no-draft

    - .rules-merge-request-to-main-no-draft

  needs: ["build-codec-linux-make"]

  stage: test

  script:
@@ -1679,10 +1667,10 @@ renderer-smoke-test: 


# from float

# test renderer executable with cmake + asan

renderer-asan:

# TODO: turn into scheduled job

.renderer-asan:

  extends:

    - .test-job-linux

    - .rules-merge-request-to-float-ref-no-draft

  needs: ["build-codec-linux-cmake"]

  stage: test

  script:
@@ -1706,10 +1694,10 @@ renderer-asan: 


# from float

# test renderer executable with cmake + msan

renderer-msan:

# TODO: turn into scheduled job

.renderer-msan:

  extends:

    - .test-job-linux

    - .rules-merge-request-to-float-ref-no-draft

  needs: ["build-codec-linux-cmake"]

  stage: test

  tags:
@@ -1735,10 +1723,10 @@ renderer-msan: 


# from float

# test renderer executable with cmake + usan

renderer-usan:

# TODO: turn into scheduled job

.renderer-usan:

  extends:

    - .test-job-linux

    - .rules-merge-request-to-float-ref-no-draft

  needs: ["build-codec-linux-cmake"]

  stage: test

  tags:

main-float.yml

+0 −1
Original line number Diff line number Diff line
@@ -282,7 +282,6 @@ branch-is-up-to-date-with-main-post: 
      junit:

        - report-junit.xml



### The stv jobs are run for both main and ivas-float-update

basop-compat-stv:

  extends:

    - .basop-ci-branch-compat-template