Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove use of METRICS_MONGO_CONNECTION, disable cimetrics #6125

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .azure-pipelines-templates/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ jobs:
- ${{ if eq(parameters.suffix, 'ScanBuild') }}:
- template: scan_build.yml

- ${{ if eq(parameters.suffix, 'Perf') }}:
- template: push_perf_data.yml
# Temporarily disabled, until cimetrics supports auth other than connection-string
# - ${{ if eq(parameters.suffix, 'Perf') }}:
# - template: push_perf_data.yml

- ${{ if eq(parameters.suffix, 'Release') }}:
- template: install_deb.yml
Expand Down
29 changes: 15 additions & 14 deletions .azure-pipelines-templates/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,17 +158,18 @@ jobs:
depends_on:
- configure

- ${{ if eq(parameters.perf_tests, 'run') }}:
- template: cimetrics.yml
parameters:
target: Virtual
env: ${{ parameters.env.Virtual }}
suffix: "Perf"
installExtendedTestingTools: false
depends_on:
- configure
- SGX_Perf
- Virtual_Perf
- Virtual_Perf_MultiThreaded
- SGX_Perf_MultiThreaded
- Simulation
# Temporarily disabled, until cimetrics supports auth other than connection-string
# - ${{ if eq(parameters.perf_tests, 'run') }}:
# - template: cimetrics.yml
# parameters:
# target: Virtual
# env: ${{ parameters.env.Virtual }}
# suffix: "Perf"
# installExtendedTestingTools: false
# depends_on:
# - configure
# - SGX_Perf
# - Virtual_Perf
# - Virtual_Perf_MultiThreaded
# - SGX_Perf_MultiThreaded
# - Simulation
4 changes: 0 additions & 4 deletions .azure-pipelines-templates/metrics.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
steps:
- script: ./cimetrics_env.sh python -m cimetrics.upload_complete
env:
METRICS_MONGO_CONNECTION: $(METRICS_MONGO_CONNECTION)
workingDirectory: tests
displayName: "Mark metrics upload as complete"

- script: ./cimetrics_env.sh python -m cimetrics.plot
env:
METRICS_MONGO_CONNECTION: $(METRICS_MONGO_CONNECTION)
workingDirectory: tests
displayName: "Plot cimetrics"

Expand Down
2 changes: 0 additions & 2 deletions .azure-pipelines-templates/push_perf_data.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
steps:
- script: ./cimetrics_env.sh python upload_pico_metrics.py
env:
METRICS_MONGO_CONNECTION: $(METRICS_MONGO_CONNECTION)
workingDirectory: build
displayName: "Upload picobench metrics"
15 changes: 7 additions & 8 deletions .azure-pipelines-templates/simulation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,13 @@ jobs:
workingDirectory: tla
displayName: Simulation

- ${{ if eq(parameters.metrics, true) }}:
- script: |
set -ex
./cimetrics_env.sh python upload_tlc_stats.py sim ../tla/SIMccfraft_stats.json
env:
METRICS_MONGO_CONNECTION: $(METRICS_MONGO_CONNECTION)
workingDirectory: tests
displayName: Uploading TLC stats to cimetrics
# Temporarily disabled, until cimetrics supports auth other than connection-string
# - ${{ if eq(parameters.metrics, true) }}:
# - script: |
# set -ex
# ./cimetrics_env.sh python upload_tlc_stats.py sim ../tla/SIMccfraft_stats.json
# workingDirectory: tests
# displayName: Uploading TLC stats to cimetrics

- task: PublishPipelineArtifact@1
inputs:
Expand Down