Merge pull request #289 from sustainable-computing-io/add-timestamp

feat: add timestamp to validator directory
sustainable-computing-io · Oct 8, 2024 · 238c393 · 238c393
2 parents 0d4cff8 + b45f205
commit 238c393
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/equinix_metal_flow.yml b/.github/workflows/equinix_metal_flow.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Run Setup Runner Action
         uses: ./.github/actions/setup-action
-        
+
       - name: List available RAPL domains
         run: |
           for file in $(sudo find -L /sys/class/powercap/intel-rapl -name name  2>/dev/null); do cat $file;  done  | sort -n| uniq | tee -a /tmp/rapl-domain-availability.txt
@@ -72,6 +72,7 @@ jobs:
           # create a directory to store the artifacts, the directory is the current date 
           set -x
           export DATE_STR=$(date +%Y-%m-%d)
+          export TIME_STR=$(date +%H-%M-%S)
           cd ${GITHUB_WORKSPACE}
           mkdir -p docs/validation/${DATE_STR}
           export KEPLER_TAG=$(ls -d /tmp/validator-* |tail -1 | sed 's/.*validator-//g')
@@ -83,29 +84,30 @@ jobs:
             --new-val-filepath /tmp/validator-${KEPLER_TAG}/${KEPLER_TAG}.json
 
           # copy the report to the directory
-          mv /tmp/validator-${KEPLER_TAG}/ docs/validation/${DATE_STR}/
-          mv /tmp/rapl-domain-availability.txt docs/validation/${DATE_STR}/validator-${KEPLER_TAG}/
-          echo "| " ${DATE_STR} " | " ${KEPLER_TAG} " | [Report](validation/${DATE_STR}/validator-${KEPLER_TAG}/report-${KEPLER_TAG}.md) | [Artifacts](validation/${DATE_STR}/validator-${KEPLER_TAG}/artifacts) |" \
+          mv /tmp/validator-${KEPLER_TAG}/ docs/validation/${DATE_STR}/validator-${KEPLER_TAG}-${TIME_STR}/
+          mv /tmp/rapl-domain-availability.txt docs/validation/${DATE_STR}/validator-${KEPLER_TAG}-${TIME_STR}/
+          echo "| " ${DATE_STR} " | " ${KEPLER_TAG}-${TIME_STR} " | [Report](validation/${DATE_STR}/validator-${KEPLER_TAG}-${TIME_STR}/report-${KEPLER_TAG}.md) | [Artifacts](validation/${DATE_STR}/validator-${KEPLER_TAG}-${TIME_STR}/artifacts) |" \
             >> docs/kepler-model-validation.md
 
           # Capture Prometheus TSDB Snapshot
-          mkdir -p docs/validation/${DATE_STR}/validator-${KEPLER_TAG}/prometheus-snapshot
+          mkdir -p docs/validation/${DATE_STR}/validator-${KEPLER_TAG}-${TIME_STR}/prometheus-snapshot
           snap_name=$(curl -XPOST http://localhost:9090/api/v1/admin/tsdb/snapshot | jq -r '.data.name')
-          tar -cvzf docs/validation/${DATE_STR}/validator-${KEPLER_TAG}/prometheus-snapshot/snapshot.tar.gz -C \
+          tar -cvzf docs/validation/${DATE_STR}/validator-${KEPLER_TAG}-${TIME_STR}/prometheus-snapshot/snapshot.tar.gz -C \
             /var/lib/prometheus/snapshots ${snap_name}
 
           # Push to the repo
           git config user.email "dependabot[bot]@users.noreply.github.com"
           git config user.name "dependabot[bot]"
           git add docs/*
-          git commit -m "Add validation report for ${DATE_STR}" -s
+          git commit -m "Add validation report for ${DATE_STR}-${TIME_STR}" -s
           git push
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
       - name: Update model validation chart
         run: |
           export DATE_STR=$(date +%Y-%m-%d)
+          export TIME_STR=$(date +%H-%M-%S)
           cd ${GITHUB_WORKSPACE}
           cd docs/analytics
           python -m pip install --upgrade pip
@@ -117,7 +119,7 @@ jobs:
           cd ${GITHUB_WORKSPACE}
           git add docs/analytics/*
           git add docs/kepler-model-validation-chart.md
-          git commit -m "Add validation chart for ${DATE_STR}" -s
+          git commit -m "Add validation chart for ${DATE_STR}-${TIME_STR}" -s
           git push
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

diff --git a/.github/workflows/equinix_metal_model_server_action_flow.yml b/.github/workflows/equinix_metal_model_server_action_flow.yml
@@ -64,6 +64,7 @@ jobs:
           # create a directory to store the artifacts, the directory is the current date 
           set -x
           export DATE_STR=$(date +%Y-%m-%d)
+          export TIME_STR=$(date +%H-%M-%S)
           cd ${GITHUB_WORKSPACE}
           mkdir -p docs/validation/${DATE_STR}
           export KEPLER_TAG=$(ls -d /tmp/validator-* |tail -1 | sed 's/.*validator-//g')
@@ -75,21 +76,21 @@ jobs:
             --new-val-filepath /tmp/validator-${KEPLER_TAG}/${KEPLER_TAG}.json
 
           # copy the report to the directory
-          mv /tmp/validator-${KEPLER_TAG}/ docs/validation/${DATE_STR}/validator-${KEPLER_TAG}-model-server
-          echo "| " ${DATE_STR} " | " ${KEPLER_TAG}-model-server " | [Report](validation/${DATE_STR}/validator-${KEPLER_TAG}-model-server/report-${KEPLER_TAG}.md) | [Artifacts](validation/${DATE_STR}/validator-${KEPLER_TAG}-model-server/artifacts) |" \
+          mv /tmp/validator-${KEPLER_TAG}/ docs/validation/${DATE_STR}/validator-${KEPLER_TAG}-${TIME_STR}-model-server
+          echo "| " ${DATE_STR} " | " ${KEPLER_TAG}-${TIME_STR}-model-server " | [Report](validation/${DATE_STR}/validator-${KEPLER_TAG}-${TIME_STR}-model-server/report-${KEPLER_TAG}.md) | [Artifacts](validation/${DATE_STR}/validator-${KEPLER_TAG}-${TIME_STR}-model-server/artifacts) |" \
             >> docs/kepler-model-validation.md
 
           # Capture Prometheus TSDB Snapshot
-          mkdir -p docs/validation/${DATE_STR}/validator-${KEPLER_TAG}-model-server/prometheus-snapshot
+          mkdir -p docs/validation/${DATE_STR}/validator-${KEPLER_TAG}-${TIME_STR}-model-server/prometheus-snapshot
           snap_name=$(curl -XPOST http://localhost:9090/api/v1/admin/tsdb/snapshot | jq -r '.data.name')
-          tar -cvzf docs/validation/${DATE_STR}/validator-${KEPLER_TAG}-model-server/prometheus-snapshot/snapshot.tar.gz -C \
+          tar -cvzf docs/validation/${DATE_STR}/validator-${KEPLER_TAG}-${TIME_STR}-model-server/prometheus-snapshot/snapshot.tar.gz -C \
             /var/lib/prometheus/snapshots ${snap_name}
 
           # Push to the repo
           git config user.email "dependabot[bot]@users.noreply.github.com"
           git config user.name "dependabot[bot]"
           git add docs/*
-          git commit -m "Add model server validation report for ${DATE_STR}" -s
+          git commit -m "Add model server validation report for ${DATE_STR}-${TIME_STR}" -s
           git push
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}