Commit 5626f97d authored by Jan Kiene's avatar Jan Kiene
Browse files

more cleanup

parent 91d5ed10

.gitlab-ci.yml

+1 −11
Original line number Diff line number Diff line
@@ -46,10 +46,6 @@ check-merged-ci-config-is-valid: 
    - TEST_YML="${REPO}-ci.yml"

    - BASE_YML="${REPO}-base-ci.yml"



 

    - git fetch origin

    - git checkout $CI_COMMIT_REF_NAME



    # Approach for validating the CI configs:

    # Due to intricacies of gitlab API token perissions/setup, the setup is a bit convoluted. We can't

    # just call the the lint API endpoint of the repective repos, but instead need to
@@ -80,8 +76,6 @@ check-merged-ci-config-is-valid: 


    # lint the whole merged thing statically (previous call tries to run pipeline which does not work because ivas-codec does not have push pipelines...)

    - jq -r ".merged_yaml" $BASELINE_RESPONSE > $ARTIFACTS_BASELINE_YAML

    - cat $ARTIFACTS_BASELINE_YAML

    - rm $BASELINE_RESPONSE

    - |

      jq -Rs '{ content: . }' < $ARTIFACTS_BASELINE_YAML \

      | curl -sS -X POST \
@@ -107,8 +101,6 @@ check-merged-ci-config-is-valid: 


    # lint the whole merged thing statically (previous call tries to run pipeline which does not work because ivas-codec does not have push pipelines...)

    - jq -r ".merged_yaml" $MERGED_RESPONSE > $ARTIFACTS_MERGED_YAML

    - rm $MERGED_RESPONSE

    - cat $ARTIFACTS_MERGED_YAML

    - |

      jq -Rs '{ content: . }' <$ARTIFACTS_MERGED_YAML \

      | curl -sS -X POST \
@@ -118,7 +110,7 @@ check-merged-ci-config-is-valid: 
         --output $MERGED_RESPONSE \

         --data-binary @-



    - echo "=== Computing diff ==="

    # find semantic diff between merged yaml with main and with this branch

    - dyff between $ARTIFACTS_BASELINE_YAML $ARTIFACTS_MERGED_YAML | tee $ARTIFACTS_DIFF_YAML || true



    # Check validity
@@ -135,8 +127,6 @@ check-merged-ci-config-is-valid: 
        jq -r ".errors" $MERGED_RESPONSE

        exit 1

      fi

 



  artifacts:

    when: always

    access: all