Skip to content

Commit e6ac316

Browse files
authored
yaml: Lint CI and repo configs (envoyproxy#16844)
Signed-off-by: Ryan Northey <[email protected]>
1 parent 2258ae9 commit e6ac316

File tree

11 files changed

+757
-758
lines changed

11 files changed

+757
-758
lines changed

.azure-pipelines/bazel.yml

+74-74
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,85 @@
11
parameters:
2-
- name: ciTarget
3-
displayName: "CI target"
4-
type: string
5-
default: bazel.release
6-
- name: artifactSuffix
7-
displayName: "Suffix of artifact"
8-
type: string
9-
default: ""
10-
- name: rbe
11-
displayName: "Enable RBE"
12-
type: boolean
13-
default: true
14-
- name: managedAgent
15-
type: boolean
16-
default: true
17-
- name: bazelBuildExtraOptions
18-
type: string
19-
default: "--flaky_test_attempts=2"
2+
- name: ciTarget
3+
displayName: "CI target"
4+
type: string
5+
default: bazel.release
6+
- name: artifactSuffix
7+
displayName: "Suffix of artifact"
8+
type: string
9+
default: ""
10+
- name: rbe
11+
displayName: "Enable RBE"
12+
type: boolean
13+
default: true
14+
- name: managedAgent
15+
type: boolean
16+
default: true
17+
- name: bazelBuildExtraOptions
18+
type: string
19+
default: "--flaky_test_attempts=2"
2020

2121
steps:
22-
- task: Cache@2
23-
inputs:
24-
key: '"${{ parameters.ciTarget }}" | ./WORKSPACE | **/*.bzl'
25-
path: $(Build.StagingDirectory)/repository_cache
26-
continueOnError: true
22+
- task: Cache@2
23+
inputs:
24+
key: '"${{ parameters.ciTarget }}" | ./WORKSPACE | **/*.bzl'
25+
path: $(Build.StagingDirectory)/repository_cache
26+
continueOnError: true
2727

28-
- bash: .azure-pipelines/cleanup.sh
29-
displayName: "Removing tools from agent"
30-
condition: ${{ parameters.managedAgent }}
28+
- bash: .azure-pipelines/cleanup.sh
29+
displayName: "Removing tools from agent"
30+
condition: ${{ parameters.managedAgent }}
3131

32-
- bash: |
33-
echo "disk space at beginning of build:"
34-
df -h
35-
displayName: "Check disk space at beginning"
32+
- bash: |
33+
echo "disk space at beginning of build:"
34+
df -h
35+
displayName: "Check disk space at beginning"
3636

37-
- bash: |
38-
sudo mkdir -p /etc/docker
39-
echo '{
40-
"ipv6": true,
41-
"fixed-cidr-v6": "2001:db8:1::/64"
42-
}' | sudo tee /etc/docker/daemon.json
43-
sudo service docker restart
44-
displayName: "Enable IPv6"
45-
condition: ${{ parameters.managedAgent }}
37+
- bash: |
38+
sudo mkdir -p /etc/docker
39+
echo '{
40+
"ipv6": true,
41+
"fixed-cidr-v6": "2001:db8:1::/64"
42+
}' | sudo tee /etc/docker/daemon.json
43+
sudo service docker restart
44+
displayName: "Enable IPv6"
45+
condition: ${{ parameters.managedAgent }}
4646

47-
- script: ci/run_envoy_docker.sh 'ci/do_ci.sh ${{ parameters.ciTarget }}'
48-
workingDirectory: $(Build.SourcesDirectory)
49-
env:
50-
ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory)
51-
SLACK_TOKEN: $(SLACK_TOKEN)
52-
REPO_URI: $(Build.Repository.Uri)
53-
BUILD_URI: $(Build.BuildUri)
54-
${{ if parameters.rbe }}:
55-
ENVOY_RBE: "1"
56-
BAZEL_BUILD_EXTRA_OPTIONS: "--config=remote-ci --jobs=$(RbeJobs) ${{ parameters.bazelBuildExtraOptions }}"
57-
BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com
58-
BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance
59-
GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)
60-
${{ if eq(parameters.rbe, false) }}:
61-
BAZEL_BUILD_EXTRA_OPTIONS: "${{ parameters.bazelBuildExtraOptions }}"
62-
BAZEL_REMOTE_CACHE: $(LocalBuildCache)
47+
- script: ci/run_envoy_docker.sh 'ci/do_ci.sh ${{ parameters.ciTarget }}'
48+
workingDirectory: $(Build.SourcesDirectory)
49+
env:
50+
ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory)
51+
SLACK_TOKEN: $(SLACK_TOKEN)
52+
REPO_URI: $(Build.Repository.Uri)
53+
BUILD_URI: $(Build.BuildUri)
54+
${{ if parameters.rbe }}:
55+
ENVOY_RBE: "1"
56+
BAZEL_BUILD_EXTRA_OPTIONS: "--config=remote-ci --jobs=$(RbeJobs) ${{ parameters.bazelBuildExtraOptions }}"
57+
BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com
58+
BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance
59+
GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)
60+
${{ if eq(parameters.rbe, false) }}:
61+
BAZEL_BUILD_EXTRA_OPTIONS: "${{ parameters.bazelBuildExtraOptions }}"
62+
BAZEL_REMOTE_CACHE: $(LocalBuildCache)
6363

64-
displayName: "Run CI script"
64+
displayName: "Run CI script"
6565

66-
- bash: |
67-
echo "disk space at end of build:"
68-
df -h
69-
# Cleanup offending files with unicode names
70-
rm -rf $(Build.StagingDirectory)/tmp/*/*/external/go_sdk/test/fixedbugs
71-
displayName: "Check disk space at end"
72-
condition: always()
66+
- bash: |
67+
echo "disk space at end of build:"
68+
df -h
69+
# Cleanup offending files with unicode names
70+
rm -rf $(Build.StagingDirectory)/tmp/*/*/external/go_sdk/test/fixedbugs
71+
displayName: "Check disk space at end"
72+
condition: always()
7373

74-
- task: PublishTestResults@2
75-
inputs:
76-
testResultsFiles: "**/bazel-out/**/testlogs/**/test.xml"
77-
testRunTitle: "${{ parameters.ciTarget }}"
78-
searchFolder: $(Build.StagingDirectory)/tmp
79-
condition: always()
74+
- task: PublishTestResults@2
75+
inputs:
76+
testResultsFiles: "**/bazel-out/**/testlogs/**/test.xml"
77+
testRunTitle: "${{ parameters.ciTarget }}"
78+
searchFolder: $(Build.StagingDirectory)/tmp
79+
condition: always()
8080

81-
- task: PublishBuildArtifacts@1
82-
inputs:
83-
pathtoPublish: "$(Build.StagingDirectory)/envoy"
84-
artifactName: ${{ parameters.ciTarget }}${{ parameters.artifactSuffix }}
85-
condition: always()
81+
- task: PublishBuildArtifacts@1
82+
inputs:
83+
pathtoPublish: "$(Build.StagingDirectory)/envoy"
84+
artifactName: ${{ parameters.ciTarget }}${{ parameters.artifactSuffix }}
85+
condition: always()

.azure-pipelines/cve_scan.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ schedules:
1515
pool:
1616
vmImage: "ubuntu-18.04"
1717
steps:
18-
- script: ci/run_envoy_docker.sh 'ci/do_ci.sh cve_scan'
19-
workingDirectory: $(Build.SourcesDirectory)
20-
env:
21-
ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory)
22-
displayName: "Scan for CVEs in dependencies"
18+
- script: ci/run_envoy_docker.sh 'ci/do_ci.sh cve_scan'
19+
workingDirectory: $(Build.SourcesDirectory)
20+
env:
21+
ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory)
22+
displayName: "Scan for CVEs in dependencies"

0 commit comments

Comments
 (0)