Merge 9c1d50d into 76c7836

RasaHQ · Apr 20, 2021 · a9f22a8 · a9f22a8
2 parents 76c7836 + 9c1d50d
commit a9f22a8
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 1 deletion.
diff --git a/.github/scripts/mr_generate_summary.py b/.github/scripts/mr_generate_summary.py
@@ -23,6 +23,7 @@ def generate_json(file, task, data):
 
     data[DATASET][CONFIG] = {
         "dataset_repository_branch": DATASET_REPOSITORY_BRANCH,
+        "dataset_commit": os.environ["DATASET_COMMIT"],
         "accelerator_type": os.environ["ACCELERATOR_TYPE"],
         "test_run_time": os.environ["TEST_RUN_TIME"],
         "train_run_time": os.environ["TRAIN_RUN_TIME"],

diff --git a/.github/scripts/mr_publish_results.py b/.github/scripts/mr_publish_results.py
@@ -28,6 +28,7 @@ def send_to_segment(context):
         {
             "dataset": os.environ["DATASET_NAME"],
             "dataset_repository_branch": os.environ["DATASET_REPOSITORY_BRANCH"],
+            "dataset_commit": os.environ["DATASET_COMMIT"],
             "workflow": os.environ["GITHUB_WORKFLOW"],
             "config": os.environ["CONFIG"],
             "pr_url": os.environ["PR_URL"],

diff --git a/.github/templates/model_regression_test_results.tmpl b/.github/templates/model_regression_test_results.tmpl
@@ -31,7 +31,7 @@ The print_result template returns data depends on available fields.
 {{- $results_main := (datasource "results_main") -}}
 {{ range $dataset, $config := (datasource "data")}}
 {{- $dataset_main := (index $results_main $dataset) -}}
-Dataset: `{{$dataset}}`, Dataset repository branch: `{{ (index $config (index (keys $config) 0)).dataset_repository_branch }}`
+Dataset: `{{$dataset}}`, Dataset repository branch: `{{ (index $config (index (keys $config) 0)).dataset_repository_branch }}`, commit: `{{ (index $config (index (keys $config) 0)).dataset_commit }}`
 
 | Configuration | Intent Classification Micro F1 | Entity Recognition Micro F1 | Response Selection Micro F1 |
 |---------------|-----------------|-----------------|-------------------|

diff --git a/.github/workflows/ci-model-regression-on-schedule.yml b/.github/workflows/ci-model-regression-on-schedule.yml
@@ -104,6 +104,14 @@ jobs:
           token: ${{ secrets.ML_TEST_SA_PAT }}
           path: 'dataset'
 
+      - name: Set dataset commit
+        id: set-dataset-commit
+        working-directory: dataset
+        run: |
+          DATASET_COMMIT=$(git rev-parse HEAD)
+          echo $DATASET_COMMIT
+          echo "::set-output name=dataset_commit::$DATASET_COMMIT"
+
       - name: Set DATASET and CONFIG variables
         id: set_dataset_config_vars
         env:
@@ -208,6 +216,7 @@ jobs:
           TOTAL_RUN_TIME: ${{ steps.run_test.outputs.total_run_time }}
           PR_URL: ""
           DATASET_REPOSITORY_BRANCH: "main"
+          DATASET_COMMIT: ${{ steps.set-dataset-commit.outputs.dataset_commit }}
         run: |-
           poetry run pip install analytics-python
           poetry run python .github/scripts/mr_publish_results.py

diff --git a/.github/workflows/ci-model-regression.yml b/.github/workflows/ci-model-regression.yml
@@ -34,6 +34,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
       configuration_id: ${{ steps.fc_config.outputs.comment-id }}
+
     steps:
     - name: Checkout main
       uses: actions/checkout@v2
@@ -198,6 +199,14 @@ jobs:
           path: 'dataset'
           ref: ${{ matrix.dataset_branch }}
 
+      - name: Set dataset commit
+        id: set-dataset-commit
+        working-directory: dataset
+        run: |
+          DATASET_COMMIT=$(git rev-parse HEAD)
+          echo $DATASET_COMMIT
+          echo "::set-output name=dataset_commit::$DATASET_COMMIT"
+
       - name: Set DATASET and CONFIG variables
         id: set_dataset_config_vars
         env:
@@ -300,6 +309,7 @@ jobs:
           TRAIN_RUN_TIME: ${{ steps.run_test.outputs.train_run_time }}
           TOTAL_RUN_TIME: ${{ steps.run_test.outputs.total_run_time }}
           DATASET_REPOSITORY_BRANCH: ${{ matrix.dataset_branch }}
+          DATASET_COMMIT: ${{ steps.set-dataset-commit.outputs.dataset_commit }}
         run: |-
           export PR_URL="https://github.com/${GITHUB_REPOSITORY}/pull/${{ github.event.number }}"
           poetry run pip install analytics-python
@@ -339,6 +349,14 @@ jobs:
           path: 'dataset'
           ref: ${{ matrix.dataset_branch }}
 
+      - name: Set dataset commit
+        id: set-dataset-commit
+        working-directory: dataset
+        run: |
+          DATASET_COMMIT=$(git rev-parse HEAD)
+          echo $DATASET_COMMIT
+          echo "::set-output name=dataset_commit::$DATASET_COMMIT"
+
       - name: Download gomplate
         run: |-
           sudo curl -o /usr/local/bin/gomplate -sSL https://github.com/hairyhenderson/gomplate/releases/download/v3.6.0/gomplate_linux-amd64
@@ -441,6 +459,7 @@ jobs:
           TRAIN_RUN_TIME: ${{ steps.run_test.outputs.train_run_time }}
           TOTAL_RUN_TIME: ${{ steps.run_test.outputs.total_run_time }}
           DATASET_REPOSITORY_BRANCH: ${{ matrix.dataset_branch }}
+          DATASET_COMMIT: ${{ steps.set-dataset-commit.outputs.dataset_commit }}
         run: |-
           export PR_URL="https://github.com/${GITHUB_REPOSITORY}/pull/${{ github.event.number }}"
           poetry run pip install analytics-python