t

Author: cataphract

.gitlab/benchmarks.yml

@@ -35,20 +35,53 @@ build-nginx-module:
       - .musl-build/ngx_http_datadog_module.so
     expire_in: 3 months
 
+download-artifacts:
+  stage: build
+  tags: ["arch:amd64"]
+  needs:
+    - job: build-nginx-module
+      artifacts: true
+  image: $MACROBENCHMARKS_CI_IMAGE
+  script:
+    - |
+      set -e
+      echo "Installing vault"
+      cd /tmp
+      curl -o vault.zip https://releases.hashicorp.com/vault/1.20.0/vault_1.20.0_linux_amd64.zip
+      unzip vault.zip
+      cd -
+    - export CIRCLECI_TOKEN=$(/tmp/vault kv get --format=json kv/k8s/gitlab-runner/nginx-datadog/circleci | jq -r .data.data.token)
+    # this is a token only giving read access to public data
+    - export GITHUB_TOKEN=$(/tmp/vault kv get --format=json kv/k8s/gitlab-runner/nginx-datadog/github_pub | jq -r .data.data.token)
+    - git clone --branch glopes/cpp/nginx https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform platform
+    - cd platform
+    - '[[ -z "$CI_COMMIT_BRANCH" ]] || ARTIFACT_ROLE=baseline steps/install-dd-nginx-module.sh'
+    - ARTIFACT_ROLE=candidate steps/install-dd-nginx-module.sh
+    - cd -
+    - mkdir -p artifacts
+    - cp -v platform/artifacts/*.so* artifacts/
+  artifacts:
+    name: artifacts
+    when: always
+    paths:
+      - artifacts
+    expire_in: 1 month
+  variables:
+    TEST_ARTIFACT: $CI_PROJECT_DIR/.musl-build/ngx_http_datadog_module.so
 
 .benchmarks:
   stage: run-benchmarks
-  needs: ["build-nginx-module"]
+  dependencies: ["download-artifacts"]
   tags: ["runner:apm-k8s-same-cpu"]
   timeout: 1h
   image: $MACROBENCHMARKS_CI_IMAGE
   script:
-    - cp .musl-build/ngx_http_datadog_module.so /usr/lib/nginx/modules/ngx_http_datadog_module.so
-    - git clone --branch glopes/cpp/nginx https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform platform && cd platform
-    - bp-runner bp-runner.yml --debug
-    - mkdir -p artifacts
+    - git clone --branch glopes/cpp/nginx https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform platform
+    - mkdir -p platform/artifacts
+    - cp -v artifacts/* platform/artifacts
+    - cd platform && bp-runner bp-runner.yml --debug
+    - cd -
     - cp -v platform/artifacts/*.converted.json artifacts/
-    - cp -v platform/artifacts/*.so artifacts/
     - cp -v platform/artifacts/lscpu.txt artifacts/
   artifacts:
     name: artifacts
@@ -88,20 +121,10 @@ build-nginx-module:
   extends: .benchmarks
   variables:
     ARTIFACT_ROLE: candidate
-    TEST_ARTIFACT: $CI_PROJECT_DIR/.musl-build/ngx_http_datadog_module.so
 
 .baseline-benchmarks:
   extends: .benchmarks
   before_script:
-    - |
-      echo "Installing vault"
-      cd /tmp
-      curl -o vault.zip https://releases.hashicorp.com/vault/1.20.0/vault_1.20.0_linux_amd64.zip
-      unzip vault.zip
-      cd -
-    - CIRCLECI_TOKEN=$(/tmp/vault kv get --format=json kv/k8s/gitlab-runner/nginx-datadog/circleci | jq -r .data.data.token)
-    # this is a token only giving read access to public data
-    - GITHUB_TOKEN=$(/tmp/vault kv get --format=json kv/k8s/gitlab-runner/nginx-datadog/github_pub | jq -r .data.data.token)
   variables:
     ARTIFACT_ROLE: baseline
   rules:
@@ -144,6 +167,7 @@ compare-candidate-baseline:
   needs: ["baseline-only-tracing", "candidate-only-tracing", "baseline-appsec", "candidate-appsec"]
   script:
     - git clone --branch glopes/cpp/nginx https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform platform && cd platform
+    - mkdir -p platform/artifacts
     - cp -v artifacts/* platform/artifacts
     - cd platform
     - steps/analyze-results.sh