diff --git a/.github/workflows/auto-nightly-ci.yaml b/.github/workflows/auto-nightly-ci.yaml index d2f8b699d..8f57d2cc8 100644 --- a/.github/workflows/auto-nightly-ci.yaml +++ b/.github/workflows/auto-nightly-ci.yaml @@ -14,71 +14,71 @@ jobs: with: ipfamily: all - call_ci_v1_22_7: + call_ci_v1_22: # it races to upload images and artifacts when all jobs running , so just call_ci_latest build image needs: [call_ci_latest] uses: ./.github/workflows/auto-pr-ci.yaml secrets: inherit with: - kindNodeImage: v1.22.7 + kindNodeImage: kindest/node:v1.22.17 ipfamily: dual justE2E: 'true' - call_ci_v1_23_5: + call_ci_v1_23: # it races to upload images and artifacts when all jobs running , so just call_ci_latest build image needs: [call_ci_latest] uses: ./.github/workflows/auto-pr-ci.yaml secrets: inherit with: - kindNodeImage: v1.23.5 + kindNodeImage: kindest/node:v1.23.17 ipfamily: dual justE2E: 'true' - call_ci_v1_24_4: + call_ci_v1_24: # it races to upload images and artifacts when all jobs running , so just call_ci_latest build image needs: [call_ci_latest] uses: ./.github/workflows/auto-pr-ci.yaml secrets: inherit with: - kindNodeImage: v1.24.4 + kindNodeImage: kindest/node:v1.24.13 ipfamily: dual justE2E: 'true' - call_ci_v1_25_3: + call_ci_v1_25: # it races to upload images and artifacts when all jobs running , so just call_ci_latest build image needs: [call_ci_latest] uses: ./.github/workflows/auto-pr-ci.yaml secrets: inherit with: - kindNodeImage: v1.25.3 + kindNodeImage: kindest/node:v1.25.9 ipfamily: dual justE2E: 'true' - call_ci_v1_26_2: + call_ci_v1_26: # it races to upload images and artifacts when all jobs running , so just call_ci_latest build image needs: [call_ci_latest] uses: ./.github/workflows/auto-pr-ci.yaml secrets: inherit with: - kindNodeImage: v1.26.2 + kindNodeImage: kindest/node:v1.26.4 ipfamily: dual justE2E: 'true' - call_ci_v1_27_1: + call_ci_v1_27: # it races to upload images and artifacts when all jobs running , so just call_ci_latest build image needs: [call_ci_latest] uses: ./.github/workflows/auto-pr-ci.yaml secrets: inherit with: - kindNodeImage: v1.27.1 + kindNodeImage: kindest/node:v1.27.1 ipfamily: dual justE2E: 'true' creat_issue: runs-on: ubuntu-latest - needs: [call_ci_latest, call_ci_v1_22_7, call_ci_v1_23_5, call_ci_v1_24_4, call_ci_v1_25_3, call_ci_v1_26_2, call_ci_v1_27_1] + needs: [call_ci_latest, call_ci_v1_22, call_ci_v1_23, call_ci_v1_24, call_ci_v1_25, call_ci_v1_26, call_ci_v1_27] # https://docs.github.com/en/actions/learn-github-actions/contexts#jobs-context - if: ${{ always() && ( needs.call_ci_latest.result == 'failure' || needs.call_ci_v1_22_7.result == 'failure' || needs.call_ci_v1_23_5.result == 'failure' || needs.call_ci_v1_24_4.result == 'failure' || needs.call_ci_v1_25_3.result == 'failure' || needs.call_ci_v1_26_2.result == 'failure' || needs.call_ci_v1_27_1.result == 'failure' ) }} + if: ${{ always() && ( needs.call_ci_latest.result == 'failure' || needs.call_ci_v1_22.result == 'failure' || needs.call_ci_v1_23.result == 'failure' || needs.call_ci_v1_24.result == 'failure' || needs.call_ci_v1_25.result == 'failure' || needs.call_ci_v1_26.result == 'failure' || needs.call_ci_v1_27.result == 'failure' ) }} steps: - name: echo run: | diff --git a/.github/workflows/call-e2e.yaml b/.github/workflows/call-e2e.yaml index b45ceeaee..874ee19a3 100644 --- a/.github/workflows/call-e2e.yaml +++ b/.github/workflows/call-e2e.yaml @@ -51,6 +51,10 @@ jobs: TMP=` date +%m%d%H%M%S ` E2E_CLUSTER_NAME="project${TMP}" echo "RUN_KIND_CLUSTER_NAME=${E2E_CLUSTER_NAME}" >> $GITHUB_ENV + TMP=${{ inputs.kind_node_image }} + VAR=${TMP##*:} + VAR=${VAR//./_} + echo "RUN_VAR=${VAR}" >> $GITHUB_ENV - name: Checkout Code uses: actions/checkout@v3 @@ -139,7 +143,7 @@ jobs: - name: Upload e2e cluster log uses: actions/upload-artifact@v3.1.1 with: - name: ${{ inputs.ipfamily }}-debuglog-${{ inputs.kind_node_image }}.txt + name: ${{ inputs.ipfamily }}-debuglog-${{ env.RUN_VAR }}.txt path: ${{ env.E2E_LOG_PATH }} retention-days: 30 @@ -147,7 +151,7 @@ jobs: if: ${{ env.RUN_UPLOAD_LOG == 'true' }} uses: actions/upload-artifact@v3.1.1 with: - name: ${{ inputs.ipfamily }}-e2ereport-${{ inputs.kind_node_image }}.json + name: ${{ inputs.ipfamily }}-e2ereport-${{ env.RUN_VAR }}.json path: ${{ env.E2E_GINKGO_REPORT_PATH }} retention-days: 30