Skip to content

Commit 6374dc7

Browse files
committed
Fix Jobs sudo issues and report files, update changelog, add more info for lhci in readme, various fixes
1 parent 0151e62 commit 6374dc7

File tree

8 files changed

+10
-9
lines changed

8 files changed

+10
-9
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
## [Unreleased]
99

10-
## [0.1.0] - 2020-02-11
10+
## [1.0.0] - 2020-02-11
1111
### Added
1212
- LHCI Server and client containers
1313
- Jenkins node plugin
1414
- Jenkins LHCI server pipeline
1515
- Docker compose to Jenkins container
16+
- Fix Jenkins sudo requirements
1617

1718
### Changed
18-
- Some containers need to restart unless sttoped
19+
- Some containers need to restart unless stopped
1920

2021
### Removed
2122
- N\A

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ To run Lighthouse CI test: **Open LighthouseCI -> Build with Parameters -> Set b
117117

118118
This job will start `lhci-client` docker container and run test with parameters using Lighthouse, pushing the results to the LHCI server running on http://localhost:9001.
119119

120+
![](docs/img/lhci-report.png)
121+
120122
## Grafana
121123

122124
### Available metrics

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ services:
125125
- SITESPEED_REPORT_PATH=$PWD/reports/sitespeed-result/
126126
- LHCI_REPORT_PATH=$PWD/reports/lhci-client/
127127
volumes:
128-
# TODO: Not sure this is needed, I could do it from FrontendJob.xml directly using the Jenkins assests.
129128
- ./reports/sitespeed-result/:/var/lib/sitespeed.io/sitespeed-result/
129+
- ./reports/lhci-client/:/var/lib/lhci/lhci-result/
130130
- /var/run/docker.sock:/var/run/docker.sock
131131
- jenkins-home:/var/jenkins_home
132132
- ./wpt-server/scripts/:/var/lib/wpt-scripts/
445 KB
Loading

docs/img/framework-architecture.png

231 KB
Loading

docs/img/lhci-report.png

133 KB
Loading

jenkins/jobs/FrontendJob.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ sudo rm -rf "$WORKSPACE/frontend_report" && sudo mkdir "$
9292

9393
# TODO: Not sure this is needed, I could do it from FrontendJob.xml directly using the Jenkins assests.
9494
cd "/var/lib/sitespeed.io/sitespeed-result/$report_dir_name/"
95-
cp -r $(ls -Art | tail -n 1)/* "$WORKSPACE/frontend_report"
95+
sudo cp -r $(ls -Art | tail -n 1)/* "$WORKSPACE/frontend_report"
9696
</command>
9797
</hudson.tasks.Shell>
9898
</builders>

jenkins/jobs/LighthouseCI.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,9 @@ runlhci="sudo docker run \
101101

102102
eval $runlhci
103103

104-
# TODO: Fix this
105-
# report_dir_name=$(echo $URL | awk -F/ &apos;{print $3}&apos;)
106-
# sudo rm -rf &quot;$WORKSPACE/lhci_report&quot; &amp;&amp; sudo mkdir &quot;$WORKSPACE/lhci_report&quot;
107-
# cd &quot;/var/lib/sitespeed.io/sitespeed-result/$report_dir_name/&quot;
108-
# cp -r $(ls -Art | tail -n 1)/* &quot;$WORKSPACE/lhci_report&quot;
104+
sudo rm -rf "$WORKSPACE/lhci_report" && sudo mkdir "$WORKSPACE/lhci_report"
105+
cd "/var/lib/lhci/lhci-result/"
106+
sudo cp -r $(ls -Art *.html | tail -n 1) "$WORKSPACE/lhci_report"
109107
</command>
110108
</hudson.tasks.Shell>
111109
</builders>

0 commit comments

Comments
 (0)