Commit 943005ca authored by Jan Kiene's avatar Jan Kiene
Browse files

Revert "use slurpfile instead of passing content directly as arg" 

This reverts commit 332afeff.
parent 332afeff

.gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ check-merged-ci-config-is-valid: 


    # Get merged baseline with target branch ref

    - |

      jq -n --slurpfile yaml "$BASE_YML" '{ content: $yaml, dry_run: true }' \

      jq -n --arg yaml "$(<$BASE_YML)" '{ content: $yaml, dry_run: true }' \

      | curl -sS -X POST \

         --url "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/ci/lint?include_merged_yaml=true&dry_run=true&ref=${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}" \

         -H "Content-Type: application/json" \
@@ -88,7 +88,7 @@ check-merged-ci-config-is-valid: 
    - cat $ARTIFACTS_BASELINE_YAML

    - rm $BASELINE_RESPONSE

    - |

      jq -n --slurpfile yaml "$ARTIFACTS_BASELINE_YAML" '{ content: $yaml }' \

      jq -n --arg yaml "$(<$ARTIFACTS_BASELINE_YAML)" '{ content: $yaml }' \

      | curl -sS -X POST \

         --url "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/ci/lint?" \

         -H "Content-Type: application/json" \
@@ -108,7 +108,7 @@ check-merged-ci-config-is-valid: 


    # Get current with feature branch ref

    - |

      jq -n --slurpfile yaml "$TEST_YML" '{ content: $yaml, dry_run: true }' \

      jq -n --arg yaml "$(<$TEST_YML)" '{ content: $yaml, dry_run: true }' \

      | curl -sS -X POST \

         --url "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/ci/lint?include_merged_yaml=true&dry_run=true&ref=${CI_COMMIT_REF_NAME}" \

         -H "Content-Type: application/json" \
@@ -121,7 +121,7 @@ check-merged-ci-config-is-valid: 
    - rm $MERGED_RESPONSE

    - cat $ARTIFACTS_MERGED_YAML

    - |

      jq -n --slurpfile yaml "$ARTIFACTS_MERGED_YAML" '{ content: $yaml }' \

      jq -n --arg yaml "$(<$ARTIFACTS_MERGED_YAML)" '{ content: $yaml }' \

      | curl -sS -X POST \

         --url "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/ci/lint?" \

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