Commit 9fd785a5 authored by Jan Kiene's avatar Jan Kiene
Browse files

silent curl + different grep

parent 43f87501

.gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -40,11 +40,11 @@ check-merged-ci-config-is-valid: 
      echo 'stages: [test]' | jq -Rs '{content: .}' | curl -sS -i -X POST -H "Content-Type: application/json" -H "PRIVATE-TOKEN: $LINT_TOKEN" --data-binary @- "https://forge.3gpp.org/rep/api/v4/projects/$project_id/ci/lint"



    - test_yml="$REPO-ci.yml"

    - curl -v --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

    - cat $test_yml

    - |

      jq -n --arg yaml "$(<$test_yml)" '.content=$yaml' \

      | curl -v -X POST \

      | curl -sS -X POST \

             --url "https://forge.3gpp.org/rep/api/v4/projects/$project_id/ci/lint?include_merged_yaml=true" \

             -H "Content-Type: application/json" \

             -H "PRIVATE-TOKEN: $LINT_TOKEN" \
@@ -54,14 +54,14 @@ check-merged-ci-config-is-valid: 
    - sed -i".bak" "s/\&IVAS_CODEC_CI_REF main/\&IVAS_CODEC_CI_REF ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}/" $test_yml

    - |

      jq -n --arg yaml "$(<$test_yml)" '.content=$yaml' \

      | curl -X POST \

      | curl -sS POST \

             --url "https://forge.3gpp.org/rep/api/v4/projects/$project_id/ci/lint?include_merged_yaml=true" \

             -H "Content-Type: application/json" \

             -H "PRIVATE-TOKEN: $LINT_TOKEN" \

             --output $MERGED_RESPONSE \

             --data-binary @-

    - |

      grep "\"valid\": true" $MERGED_RESPONSE

      grep "valid" $MERGED_RESPONSE | grep "true"

  artifacts:

    when: always

    access: all