From 07b85bda5e20dc88c44eddd707a75d6fc16175b0 Mon Sep 17 00:00:00 2001
From: Slava <20563034+veaceslavdoina@users.noreply.github.com>
Date: Fri, 21 Jul 2023 10:03:10 +0300
Subject: [PATCH] Add new variables to the job/pod (#35)

---
 .github/workflows/dist-tests.yaml | 11 ++++++-----
 docker/job.yaml                   |  4 ++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/dist-tests.yaml b/.github/workflows/dist-tests.yaml
index 8133b30..a059cfe 100644
--- a/.github/workflows/dist-tests.yaml
+++ b/.github/workflows/dist-tests.yaml
@@ -15,19 +15,19 @@ on:
   workflow_dispatch:
     inputs:
       branch:
-        description: Branch
+        description: Branch (master)
         required: false
         type: string
       source:
-        description: Repository with tests
+        description: Repository with tests (current)
         required: false
         type: string
       nameprefix:
-        description: Runner job/pod name prefix
+        description: Runner prefix (cs-codex-dist-tests)
         required: false
         type: string
       namespace:
-        description: Kubernetes namespace for runner
+        description: Runner namespace (cs-codex-dist-tests)
         required: false
         type: string
 
@@ -56,6 +56,8 @@ jobs:
           [[ -n "${{ inputs.source }}" ]] && echo "SOURCE=${{ inputs.source }}" >>"$GITHUB_ENV" || echo "SOURCE=${{ env.SOURCE }}" >>"$GITHUB_ENV"
           [[ -n "${{ inputs.nameprefix }}" ]] && echo "NAMEPREFIX=${{ inputs.nameprefix }}" >>"$GITHUB_ENV" || echo "NAMEPREFIX=${{ env.NAMEPREFIX }}" >>"$GITHUB_ENV"
           [[ -n "${{ inputs.namespace }}" ]] && echo "NAMESPACE=${{ inputs.namespace }}" >>"$GITHUB_ENV" || echo "NAMESPACE=${{ env.NAMESPACE }}" >>"$GITHUB_ENV"
+          echo "RUNID=$(date +%Y%m%d-%H%M%S)" >> $GITHUB_ENV
+          echo "TESTID=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
 
       - name: Kubectl - Install ${{ env.KUBE_VERSION }}
         uses: azure/setup-kubectl@v3
@@ -69,5 +71,4 @@ jobs:
 
       - name: Kubectl - Create Job
         run: |
-          export RUNID=$(date +%Y%m%d-%H%M%S)
           envsubst < ${{ env.JOB_MANIFEST }} | kubectl apply -f -
diff --git a/docker/job.yaml b/docker/job.yaml
index fb4590a..3583209 100644
--- a/docker/job.yaml
+++ b/docker/job.yaml
@@ -28,6 +28,10 @@ spec:
           value: ${BRANCH}
         - name: SOURCE
           value: ${SOURCE}
+        - name: RUNID
+          value: ${RUNID}
+        - name: TESTID
+          value: ${TESTID}
         volumeMounts:
         - name: kubeconfig
           mountPath: /opt/kubeconfig.yaml