ci: format all YAML with `yq`
`yq` is the YAML query tool, used for manipulating YAML files. This
change uses the following command to read in and to pretty-print every
YAML file in this repository:
for x in $(find . -name '*.yaml'); do
yq -i -P -oy $x
done
This makes it a bit easier to automate synchronisation between staging
and upstream, as yq always pretty-prints the entire document when
manipulating files.
Signed-off-by: Chris Kay <chris.kay@arm.com>
Change-Id: If973766fa26500d5320612422d1b4999b23439d3
diff --git a/tf-a-lts2.12-tftf-gerrit-tforg-l1.yaml b/tf-a-lts2.12-tftf-gerrit-tforg-l1.yaml
index 91745db..82365c5 100644
--- a/tf-a-lts2.12-tftf-gerrit-tforg-l1.yaml
+++ b/tf-a-lts2.12-tftf-gerrit-tforg-l1.yaml
@@ -8,147 +8,145 @@
Job that triggers for every TF-A-Tests patch approved with the Allow-CI+1
label on review.trustedfirmware.org.
properties:
- - throttle:
- option: project
- enabled: true
- max-total: 5
- - build-discarder:
- days-to-keep: 14
+ - throttle:
+ option: project
+ enabled: true
+ max-total: 5
+ - build-discarder:
+ days-to-keep: 14
parameters:
- - string:
- name: GERRIT_PROJECT
- default: 'TF-A/tf-a-tests'
- - string:
- name: GERRIT_BRANCH
- default: 'refs/heads/lts-v2.12'
- - string:
- name: GERRIT_REFSPEC
- default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
- - string:
- name: GERRIT_PATCHSET_NUMBER
- default: ''
- - string:
- name: GERRIT_CHANGE_NUMBER
- default: ''
- - string:
- name: TF_GERRIT_BRANCH
- default: 'refs/heads/lts-v2.12'
- description: "Git project branch for Trusted Firmware-A."
- - string:
- name: TF_GERRIT_REFSPEC
- default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
- description: "Git refspec for Trusted Firmware-A."
- - string:
- name: TFTF_GERRIT_REFSPEC
- default: ${GERRIT_REFSPEC}
- description: 'Parameter only used by the clone script'
- - string:
- name: SPM_REFSPEC
- default: 'lts-v2.12'
- description: |
- SPM (Hafnium) refspec to use.
- - string:
- name: CI_REFSPEC
- default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
- - string:
- name: JOBS_REFSPEC
- default: 'refs/heads/master'
- description: |
- tf-a-job-configs refspec to use. The master branch is used by default.
- - string:
- name: MBEDTLS_URL
- default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
- - string:
- name: SHARE_FOLDER
- default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
- description: 'Folder containing shared repositories for downstream pipeline jobs'
+ - string:
+ name: GERRIT_PROJECT
+ default: TF-A/tf-a-tests
+ - string:
+ name: GERRIT_BRANCH
+ default: refs/heads/lts-v2.12
+ - string:
+ name: GERRIT_REFSPEC
+ default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+ - string:
+ name: GERRIT_PATCHSET_NUMBER
+ default: ""
+ - string:
+ name: GERRIT_CHANGE_NUMBER
+ default: ""
+ - string:
+ name: TF_GERRIT_BRANCH
+ default: refs/heads/lts-v2.12
+ description: Git project branch for Trusted Firmware-A.
+ - string:
+ name: TF_GERRIT_REFSPEC
+ default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+ description: Git refspec for Trusted Firmware-A.
+ - string:
+ name: TFTF_GERRIT_REFSPEC
+ default: ${GERRIT_REFSPEC}
+ description: Parameter only used by the clone script
+ - string:
+ name: SPM_REFSPEC
+ default: lts-v2.12
+ description: |
+ SPM (Hafnium) refspec to use.
+ - string:
+ name: CI_REFSPEC
+ default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+ - string:
+ name: JOBS_REFSPEC
+ default: refs/heads/master
+ description: |
+ tf-a-job-configs refspec to use. The master branch is used by default.
+ - string:
+ name: MBEDTLS_URL
+ default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+ - string:
+ name: SHARE_FOLDER
+ default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+ description: Folder containing shared repositories for downstream pipeline jobs
wrappers:
- credentials-binding:
- ssh-user-private-key:
credential-id: TFA_CI_BOT_USER_SSH_KEY
key-file-variable: CI_BOT_KEY
username-variable: CI_BOT_USERNAME
- passphrase-variable: ''
+ passphrase-variable: ""
- workspace-cleanup
- timestamps
builders:
- - shell:
- !include-raw: scripts/clone.sh
- - shell: |
- #!/bin/bash
- set -e
- cat << EOF > env.param
- GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
- GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
- GERRIT_HOST=${GERRIT_HOST}
- QA_SERVER_PROJECT=${JOB_NAME}
- QA_SERVER_VERSION=${BUILD_NUMBER}
- TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
- TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
- TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
- SHARE_FOLDER=${SHARE_FOLDER}
- EOF
- - multijob:
- condition: COMPLETED
- name: Build and static checks
- projects:
- - kill-phase-on: NEVER
- name: tf-a-static-checks
- current-parameters: true
- predefined-parameters: |-
- REPO_UNDER_TEST=tf-a-tests
- property-file: env.param
- - multijob:
- condition: COMPLETED
- name: Run doc build check
- projects:
- - kill-phase-on: NEVER
- name: tf-a-lts2.12-ci-gateway
- current-parameters: true
- predefined-parameters: |
- TEST_GROUPS=tftf-l1-check-docs
- property-file: env.param
- - multijob:
- condition: COMPLETED
- name: Build TF-A-Tests
- projects:
- - kill-phase-on: NEVER
- name: tf-a-lts2.12-ci-gateway
- current-parameters: true
- predefined-parameters: |
- TEST_GROUPS=tftf-l1-build
- property-file: env.param
- - multijob:
- condition: COMPLETED
- name: Basic TF-A-Tests test cases
- projects:
- - kill-phase-on: NEVER
- name: tf-a-lts2.12-ci-gateway
- current-parameters: true
- predefined-parameters: |
- TEST_GROUPS=tftf-l1-fvp
- property-file: env.param
+ - shell: !include-raw: scripts/clone.sh
+ - shell: |
+ #!/bin/bash
+ set -e
+ cat << EOF > env.param
+ GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+ GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+ GERRIT_HOST=${GERRIT_HOST}
+ QA_SERVER_PROJECT=${JOB_NAME}
+ QA_SERVER_VERSION=${BUILD_NUMBER}
+ TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
+ TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
+ TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+ SHARE_FOLDER=${SHARE_FOLDER}
+ EOF
+ - multijob:
+ condition: COMPLETED
+ name: Build and static checks
+ projects:
+ - kill-phase-on: NEVER
+ name: tf-a-static-checks
+ current-parameters: true
+ predefined-parameters: REPO_UNDER_TEST=tf-a-tests
+ property-file: env.param
+ - multijob:
+ condition: COMPLETED
+ name: Run doc build check
+ projects:
+ - kill-phase-on: NEVER
+ name: tf-a-lts2.12-ci-gateway
+ current-parameters: true
+ predefined-parameters: |
+ TEST_GROUPS=tftf-l1-check-docs
+ property-file: env.param
+ - multijob:
+ condition: COMPLETED
+ name: Build TF-A-Tests
+ projects:
+ - kill-phase-on: NEVER
+ name: tf-a-lts2.12-ci-gateway
+ current-parameters: true
+ predefined-parameters: |
+ TEST_GROUPS=tftf-l1-build
+ property-file: env.param
+ - multijob:
+ condition: COMPLETED
+ name: Basic TF-A-Tests test cases
+ projects:
+ - kill-phase-on: NEVER
+ name: tf-a-lts2.12-ci-gateway
+ current-parameters: true
+ predefined-parameters: |
+ TEST_GROUPS=tftf-l1-fvp
+ property-file: env.param
triggers:
- - gerrit:
- server-name: review.trustedfirmware.org
- trigger-on:
- - comment-added-event:
- approval-category: "Allow-CI"
- approval-value: 1
- projects:
- - project-compare-type: PLAIN
- project-pattern: TF-A/tf-a-tests
- branches:
- - branch-compare-type: PLAIN
- branch-pattern: lts-v2.12
- override-votes: true
- gerrit-build-started-verified-value: 0
- gerrit-build-successful-verified-value: 1
- gerrit-build-failed-verified-value: -1
- gerrit-build-unstable-verified-value: -1
- gerrit-build-notbuilt-verified-value: 0
- gerrit-build-started-codereview-value: 0
- gerrit-build-successful-codereview-value: 0
- gerrit-build-failed-codereview-value: 0
- gerrit-build-unstable-codereview-value: 0
- gerrit-build-notbuilt-codereview-value: 0
+ - gerrit:
+ server-name: review.trustedfirmware.org
+ trigger-on:
+ - comment-added-event:
+ approval-category: Allow-CI
+ approval-value: 1
+ projects:
+ - project-compare-type: PLAIN
+ project-pattern: TF-A/tf-a-tests
+ branches:
+ - branch-compare-type: PLAIN
+ branch-pattern: lts-v2.12
+ override-votes: true
+ gerrit-build-started-verified-value: 0
+ gerrit-build-successful-verified-value: 1
+ gerrit-build-failed-verified-value: -1
+ gerrit-build-unstable-verified-value: -1
+ gerrit-build-notbuilt-verified-value: 0
+ gerrit-build-started-codereview-value: 0
+ gerrit-build-successful-codereview-value: 0
+ gerrit-build-failed-codereview-value: 0
+ gerrit-build-unstable-codereview-value: 0
+ gerrit-build-notbuilt-codereview-value: 0