Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow manually rebuild docker images #155

Merged
merged 5 commits into from
Sep 6, 2024
Merged

Allow manually rebuild docker images #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
812dadd
Allow manually rebuild docker images
kezhenxu94 Sep 6, 2024
7bf7ea7
Update e2e-istio.yaml
kezhenxu94 Sep 6, 2024
072e3cc
Update e2e-native.yaml
kezhenxu94 Sep 6, 2024
f5f98a3
Bump up Golang to fix wrong go version
kezhenxu94 Sep 6, 2024
5b9387e
Update kind.yaml
kezhenxu94 Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/e2e-istio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand All @@ -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
Expand All @@ -86,4 +86,3 @@ jobs:
with:
name: logs
path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"

8 changes: 1 addition & 7 deletions .github/workflows/e2e-native.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -58,4 +53,3 @@ jobs:
with:
name: logs
path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"

1 change: 1 addition & 0 deletions .github/workflows/publish-docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ on:
push:
branches:
- main
workflow_dispatch:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we need a version parameter to manually build?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we need a version parameter to manually build?

No. We would either rebuild the latest master branch or need code changes in latest master. Rebuilding an old commit doesn't make sense.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. You want to rebuild the latest for local branch? Is that the purpose?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, this would not work for fork repo, mostly it is for committers' branch.


env:
HUB: ghcr.io/apache/skywalking-satellite
Expand Down
6 changes: 4 additions & 2 deletions test/e2e/case/istio/kind.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading