Allow manually rebuild docker images (#155)

apache · Sep 6, 2024 · 76103da · 76103da
1 parent 5f104ea
commit 76103da
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/e2e-istio.yaml b/.github/workflows/e2e-istio.yaml
@@ -41,7 +41,7 @@ jobs:
       ALS_ANALYZER: ${{ matrix.analyzer }}
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
           go-version: 1.21
         id: go
@@ -51,7 +51,7 @@ jobs:
       - name: Build Docker Image
         shell: bash
         run: make docker
-      - uses: apache/skywalking-infra-e2e@ebdfc93c9a1def23df14edd408e98654a1fe60cb
+      - uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
         with:
           e2e-file: test/e2e/case/istio/als/e2e.yaml
 
@@ -67,7 +67,7 @@ jobs:
       ISTIO_VERSION: ${{ matrix.istio_version }}
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
           go-version: 1.21
         id: go
@@ -77,7 +77,7 @@ jobs:
       - name: Build Docker Image
         shell: bash
         run: make docker
-      - uses: apache/skywalking-infra-e2e@45584853d6f660102c523b1e9cb5815d12ae55d3
+      - uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
         with:
           e2e-file: test/e2e/case/istio/metrics/e2e.yaml
       - uses: actions/upload-artifact@v2
@@ -86,4 +86,3 @@ jobs:
         with:
           name: logs
           path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
-
diff --git a/.github/workflows/e2e-native.yaml b/.github/workflows/e2e-native.yaml
@@ -34,11 +34,6 @@ jobs:
     name: Native E2E test
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.21
-        id: go
       - uses: actions/checkout@v2
         with:
           submodules: true
@@ -49,7 +44,7 @@ jobs:
           ./mvnw --batch-mode -f provider/pom.xml clean package -Dsw.version=8.7.0
           ./mvnw --batch-mode -f consumer/pom.xml clean package -Dsw.version=8.7.0
       - name: ${{ matrix.test.name }}
-        uses: apache/skywalking-infra-e2e@45584853d6f660102c523b1e9cb5815d12ae55d3
+        uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
         with:
           e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
       - uses: actions/upload-artifact@v2
@@ -58,4 +53,3 @@ jobs:
         with:
           name: logs
           path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
-
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
@@ -20,6 +20,7 @@ on:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 env:
   HUB: ghcr.io/apache/skywalking-satellite

diff --git a/test/e2e/case/istio/kind.yaml b/test/e2e/case/istio/kind.yaml
@@ -18,9 +18,11 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
-  # the control plane node config
   - role: control-plane
-  # the three workers
+    image: kindest/node:v1.21.14
   - role: worker
+    image: kindest/node:v1.21.14
   - role: worker
+    image: kindest/node:v1.21.14
   - role: worker
+    image: kindest/node:v1.21.14