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

Revert "use matrix mechanism for REPO_URL and PATCH_YAML, too" 

Pipeline names get too messy with this.
This reverts commit 884f23dd.
parent 884f23dd

.gitlab-ci.yml

+15 −9
Original line number Diff line number Diff line
@@ -21,16 +21,22 @@ check-merged-ci-config-is-valid: 
    REPO_URL_BASOP: "https://forge.3gpp.org/rep/sa4/audio/ivas-basop"

  parallel:

    matrix:

      - REPO: ivas-codec

        REPO_URL: "https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec"

        PATCH_YML: "main-float.yml"

      - REPO: ivas-basop

        REPO_URL: "https://forge.3gpp.org/rep/sa4/audio/ivas-basop"

        PATCH_YML: "main-basop.yml"

      - REPO:

        - ivas-codec

        - ivas-basop



  script:

    - set -euo pipefail



    - |

      if [ "$REPO" == "ivas-codec" ]; then

        repo_url=$REPO_URL_FLOAT

        patch_yml="main-float.yml"

      else

        repo_url=$REPO_URL_BASOP

        patch_yml="main-basop.yml"

      fi



    # artifact names

    - MERGED_RESPONSE="${REPO}-merged.json"

    - BASELINE_RESPONSE="${REPO}-baseline.json"
@@ -51,12 +57,12 @@ check-merged-ci-config-is-valid: 
    #   - so now we need to use the merged yaml file that we got back to again run the static lint and then finally we get a result for the whole thing being valid

 

    # Get CI file from the respective repo

    - curl -sS --url "${REPO_URL}/-/raw/main/.gitlab-ci.yml?inline=false" --output $TEST_YML

    - curl -sS --url "${repo_url}/-/raw/main/.gitlab-ci.yml?inline=false" --output $TEST_YML



    - cp $TEST_YML $BASE_YML

    - sed -i '/^include:/,$d' $BASE_YML

    - |

      echo -e "include:\n  - local: ${PATCH_YML}" >> $BASE_YML

      echo -e "include:\n  - local: ${patch_yml}" >> $BASE_YML



    # Get merged baseline with target branch ref

    - |
@@ -81,7 +87,7 @@ check-merged-ci-config-is-valid: 


    - sed -i '/^include:/,$d' $TEST_YML

    - |

      echo -e "include:\n  - local: ${PATCH_YML}" >> $TEST_YML

      echo -e "include:\n  - local: ${patch_yml}" >> $TEST_YML



    # Get current with feature branch ref

    - |