Skip to content

Commit

Permalink
chore: Use run_id rather than event number for soak artifacts (#11621)
Browse files Browse the repository at this point in the history 
* chore: Use run_id rather than event number for soak artifacts

`github.event.number`, which is the PR number, is not available to the
`workflow_run` workflow. The unique `run_id` is, however, so use that
instead.

Signed-off-by: Jesse Szwedko <jesse@szwedko.me>

* put back one pr number

Signed-off-by: Jesse Szwedko <jesse@szwedko.me>
  • Loading branch information
@jszwedko
jszwedko authored Mar 1, 2022
1 parent 7b60643 commit 635ddcc
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
64 changes: 32 additions & 32 deletions .github/workflows/soak.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,23 +253,23 @@ jobs:
- name: Run baseline experiment
run: |
rm -rf /tmp/${{ github.event.number }}-${{ github.run_attempt }}/
mkdir -p /tmp/${{ github.event.number }}-${{ github.run_attempt }}/${{ matrix.target }}/
rm -rf /tmp/${{ github.run_id }}-${{ github.run_attempt }}/
mkdir -p /tmp/${{ github.run_id }}-${{ github.run_attempt }}/${{ matrix.target }}/
./soaks/bin/soak_one.sh --soak ${{ matrix.target }} \
--build-image "false" \
--variant "baseline" \
--tag ${{ needs.compute-soak-meta.outputs.baseline-tag }} \
--cpus ${{ needs.compute-soak-meta.outputs.soak-cpus }} \
--memory ${{ needs.compute-soak-meta.outputs.soak-memory }} \
--vector-cpus ${{ needs.compute-soak-meta.outputs.vector-cpus }} \
--capture-dir /tmp/${{ github.event.number }}-${{ github.run_attempt }} \
--capture-dir /tmp/${{ github.run_id }}-${{ github.run_attempt }} \
--warmup-seconds 30
- name: Upload timing captures
uses: actions/upload-artifact@v1
with:
name: ${{ github.event.number }}-${{ github.run_attempt }}-${{ matrix.target }}-replica_${{ matrix.replica }}-baseline
path: /tmp/${{ github.event.number }}-${{ github.run_attempt }}/${{ matrix.target }}/baseline.captures
name: ${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.target }}-replica_${{ matrix.replica }}-baseline
path: /tmp/${{ github.run_id }}-${{ github.run_attempt }}/${{ matrix.target }}/baseline.captures

- name: Clear up unused images
run: |
Expand Down Expand Up @@ -300,15 +300,15 @@ jobs:
- name: Download captures artifact
uses: actions/download-artifact@v2
with:
path: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
path: ${{ github.run_id }}-${{ github.run_attempt }}-captures/

- name: Display structure of downloaded files
run: ls -R
working-directory: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
working-directory: ${{ github.run_id }}-${{ github.run_attempt }}-captures/

- name: Detect erratic
run: |
./soaks/bin/detect_erratic --capture-dir ${{ github.event.number }}-${{ github.run_attempt }}-captures/ \
./soaks/bin/detect_erratic --capture-dir ${{ github.run_id }}-${{ github.run_attempt }}-captures/ \
--vector-cpus ${{ needs.compute-soak-meta.outputs.vector-cpus }} \
--warmup-seconds 30 \
--variant baseline \
Expand Down Expand Up @@ -339,23 +339,23 @@ jobs:
- name: Run comparison experiment
run: |
rm -rf /tmp/${{ github.event.number }}-${{ github.run_attempt }}/
mkdir -p /tmp/${{ github.event.number }}-${{ github.run_attempt }}/${{ matrix.target }}/
rm -rf /tmp/${{ github.run_id }}-${{ github.run_attempt }}/
mkdir -p /tmp/${{ github.run_id }}-${{ github.run_attempt }}/${{ matrix.target }}/
./soaks/bin/soak_one.sh --soak ${{ matrix.target }} \
--build-image "false" \
--variant "comparison" \
--tag ${{ needs.compute-soak-meta.outputs.comparison-tag }} \
--cpus ${{ needs.compute-soak-meta.outputs.soak-cpus }} \
--memory ${{ needs.compute-soak-meta.outputs.soak-memory }} \
--vector-cpus ${{ needs.compute-soak-meta.outputs.vector-cpus }} \
--capture-dir /tmp/${{ github.event.number }}-${{ github.run_attempt }} \
--capture-dir /tmp/${{ github.run_id }}-${{ github.run_attempt }} \
--warmup-seconds 30
- name: Upload timing captures
uses: actions/upload-artifact@v1
with:
name: ${{ github.event.number }}-${{ github.run_attempt }}-${{ matrix.target }}-replica_${{ matrix.replica }}-comparison
path: /tmp/${{ github.event.number }}-${{ github.run_attempt }}/${{ matrix.target }}/comparison.captures
name: ${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.target }}-replica_${{ matrix.replica }}-comparison
path: /tmp/${{ github.run_id }}-${{ github.run_attempt }}/${{ matrix.target }}/comparison.captures

- name: Clear up unused images
run: |
Expand Down Expand Up @@ -386,15 +386,15 @@ jobs:
- name: Download captures artifact
uses: actions/download-artifact@v2
with:
path: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
path: ${{ github.run_id }}-${{ github.run_attempt }}-captures/

- name: Display structure of downloaded files
run: ls -R
working-directory: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
working-directory: ${{ github.run_id }}-${{ github.run_attempt }}-captures/

- name: Detect erratic
run: |
./soaks/bin/detect_erratic --capture-dir ${{ github.event.number }}-${{ github.run_attempt }}-captures/ \
./soaks/bin/detect_erratic --capture-dir ${{ github.run_id }}-${{ github.run_attempt }}-captures/ \
--vector-cpus ${{ needs.compute-soak-meta.outputs.vector-cpus }} \
--warmup-seconds 30 \
--variant comparison \
Expand Down Expand Up @@ -426,32 +426,32 @@ jobs:
- name: Download captures artifact
uses: actions/download-artifact@v2
with:
path: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
path: ${{ github.run_id }}-${{ github.run_attempt }}-captures/

- name: Display structure of downloaded files
run: ls -R
working-directory: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
working-directory: ${{ github.run_id }}-${{ github.run_attempt }}-captures/

- name: Analyze captures
run: |
./soaks/bin/analyze_experiment --capture-dir ${{ github.event.number }}-${{ github.run_attempt }}-captures/ \
./soaks/bin/analyze_experiment --capture-dir ${{ github.run_id }}-${{ github.run_attempt }}-captures/ \
--baseline-sha ${{ needs.compute-soak-meta.outputs.baseline-sha }} \
--comparison-sha ${{ needs.compute-soak-meta.outputs.comparison-sha }} \
--vector-cpus ${{ needs.compute-soak-meta.outputs.vector-cpus }} \
--warmup-seconds 30 \
--coefficient-of-variation-limit ${{ needs.compute-soak-meta.outputs.coefficient-of-variation }} \
--erratic-soaks ${{ needs.compute-soak-meta.outputs.erratic-soaks }} \
--p-value 0.1 > /tmp/${{ github.event.number}}-${{ github.run_attempt }}-analysis
--p-value 0.1 > /tmp/${{ github.run_id}}-${{ github.run_attempt }}-analysis
- uses: actions/upload-artifact@v2
with:
name: soak-analysis
path: /tmp/${{ github.event.number }}-${{ github.run_attempt }}-analysis
path: /tmp/${{ github.run_id }}-${{ github.run_attempt }}-analysis

- name: Read analysis file
id: read-analysis
uses: juliangruber/read-file-action@v1
with:
path: /tmp/${{ github.event.number }}-${{ github.run_attempt }}-analysis
path: /tmp/${{ github.run_id }}-${{ github.run_attempt }}-analysis

- name: Post Results To PR
uses: peter-evans/create-or-update-comment@v1
Expand Down Expand Up @@ -486,15 +486,15 @@ jobs:
- name: Download captures artifact
uses: actions/download-artifact@v2
with:
path: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
path: ${{ github.run_id }}-${{ github.run_attempt }}-captures/

- name: Display structure of downloaded files
run: ls -R
working-directory: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
working-directory: ${{ github.run_id }}-${{ github.run_attempt }}-captures/

- name: Detect regressions
run: |
./soaks/bin/detect_regressions --capture-dir ${{ github.event.number }}-${{ github.run_attempt }}-captures/ \
./soaks/bin/detect_regressions --capture-dir ${{ github.run_id }}-${{ github.run_attempt }}-captures/ \
--warmup-seconds 30 \
--erratic-soaks ${{ needs.compute-soak-meta.outputs.erratic-soaks }} \
--p-value 0.1
Expand Down Expand Up @@ -524,21 +524,21 @@ jobs:
- name: Download captures artifact
uses: actions/download-artifact@v2
with:
path: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
path: ${{ github.run_id }}-${{ github.run_attempt }}-captures/

- name: Display structure of downloaded files
run: ls -R
working-directory: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
working-directory: ${{ github.run_id }}-${{ github.run_attempt }}-captures/

- name: Plot analysis
run: |
mkdir -p ${{ github.event.number }}-${{ github.run_attempt }}-captures/plots/
./soaks/bin/plot_analysis --capture-dir ${{ github.event.number }}-${{ github.run_attempt }}-captures/ \
--output-dir ${{ github.event.number }}-${{ github.run_attempt }}-captures/plots/ \
mkdir -p ${{ github.run_id }}-${{ github.run_attempt }}-captures/plots/
./soaks/bin/plot_analysis --capture-dir ${{ github.run_id }}-${{ github.run_attempt }}-captures/ \
--output-dir ${{ github.run_id }}-${{ github.run_attempt }}-captures/plots/ \
--vector-cpus ${{ needs.compute-soak-meta.outputs.vector-cpus }}
- name: Upload plots
uses: actions/upload-artifact@v1
with:
name: ${{ github.event.number }}-${{ github.run_attempt }}-captures-plots
path: "${{ github.event.number }}-${{ github.run_attempt }}-captures/plots"
name: ${{ github.run_id }}-${{ github.run_attempt }}-captures-plots
path: "${{ github.run_id }}-${{ github.run_attempt }}-captures/plots"
2 changes: 1 addition & 1 deletion .github/workflows/soak_comment.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
id: read-analysis
uses: juliangruber/read-file-action@v1
with:
path: /tmp/${{ github.event.workflow_run.run_number }}-${{ github.event.workflow_run.run_attempt }}-analysis
path: /tmp/${{ github.event.workflow_run.run_id }}-${{ github.event.workflow_run.run_attempt }}-analysis

- name: Post Results To PR
uses: peter-evans/create-or-update-comment@v1
Expand Down

0 comments on commit 635ddcc

Please sign in to comment.