fix git ref name in e2e (#2218)

kubeovn · Jan 4, 2023 · 64d6f24 · 64d6f24
1 parent b0cd45c
commit 64d6f24
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml
@@ -144,7 +144,7 @@ jobs:
 
       - name: Export E2E directory
         run: |
-          if [ '${{ github.base_ref || github.ref }}' = '${{ github.event.repository.default_branch }}' ]; then
+          if [ '${{ github.base_ref || github.ref_name }}' = '${{ github.event.repository.default_branch }}' ]; then
             echo "E2E_DIR=." >> "$GITHUB_ENV"
           else
             echo "E2E_DIR=test/e2e/source" >> "$GITHUB_ENV"
@@ -237,7 +237,7 @@ jobs:
 
       - name: Export E2E directory
         run: |
-          if [ '${{ github.base_ref || github.ref }}' = '${{ github.event.repository.default_branch }}' ]; then
+          if [ '${{ github.base_ref || github.ref_name }}' = '${{ github.event.repository.default_branch }}' ]; then
             echo "E2E_DIR=." >> "$GITHUB_ENV"
           else
             echo "E2E_DIR=test/e2e/source" >> "$GITHUB_ENV"
@@ -326,7 +326,7 @@ jobs:
 
       - name: Export E2E directory
         run: |
-          if [ '${{ github.base_ref || github.ref }}' = '${{ github.event.repository.default_branch }}' ]; then
+          if [ '${{ github.base_ref || github.ref_name }}' = '${{ github.event.repository.default_branch }}' ]; then
             echo "E2E_DIR=." >> "$GITHUB_ENV"
           else
             echo "E2E_DIR=test/e2e/source" >> "$GITHUB_ENV"
@@ -391,7 +391,7 @@ jobs:
 
       - name: Export E2E directory
         run: |
-          if [ '${{ github.base_ref || github.ref }}' = '${{ github.event.repository.default_branch }}' ]; then
+          if [ '${{ github.base_ref || github.ref_name }}' = '${{ github.event.repository.default_branch }}' ]; then
             echo "E2E_DIR=." >> "$GITHUB_ENV"
           else
             echo "E2E_DIR=test/e2e/source" >> "$GITHUB_ENV"
@@ -447,7 +447,7 @@ jobs:
       - name: Run E2E
         working-directory: ${{ env.E2E_DIR }}
         env:
-          E2E_BRANCH: ${{ github.base_ref || github.ref }}
+          E2E_BRANCH: ${{ github.base_ref || github.ref_name }}
           E2E_IP_FAMILY: ${{ matrix.ip-family }}
           E2E_NETWORK_MODE: ${{ matrix.mode }}
         run: make kube-ovn-conformance-e2e
@@ -475,7 +475,7 @@ jobs:
 
       - name: Export E2E directory
         run: |
-          if [ '${{ github.base_ref || github.ref }}' = '${{ github.event.repository.default_branch }}' ]; then
+          if [ '${{ github.base_ref || github.ref_name }}' = '${{ github.event.repository.default_branch }}' ]; then
             echo "E2E_DIR=." >> "$GITHUB_ENV"
           else
             echo "E2E_DIR=test/e2e/source" >> "$GITHUB_ENV"
@@ -739,7 +739,7 @@ jobs:
 
       - name: Export E2E directory
         run: |
-          if [ '${{ github.base_ref || github.ref }}' = '${{ github.event.repository.default_branch }}' ]; then
+          if [ '${{ github.base_ref || github.ref_name }}' = '${{ github.event.repository.default_branch }}' ]; then
             echo "E2E_DIR=." >> "$GITHUB_ENV"
           else
             echo "E2E_DIR=test/e2e/source" >> "$GITHUB_ENV"
@@ -865,7 +865,7 @@ jobs:
 
       - name: Export E2E directory
         run: |
-          if [ '${{ github.base_ref || github.ref }}' = '${{ github.event.repository.default_branch }}' ]; then
+          if [ '${{ github.base_ref || github.ref_name }}' = '${{ github.event.repository.default_branch }}' ]; then
             echo "E2E_DIR=." >> "$GITHUB_ENV"
           else
             echo "E2E_DIR=test/e2e/source" >> "$GITHUB_ENV"