Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 24 additions & 6 deletions .github/workflows/integrate-cluster-cmd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,24 @@ on:

jobs:
cluster:
runs-on: ubuntu-22.04
runs-on:
labels: arc-runner-set-docker-pingcap
strategy:
fail-fast: true
matrix:
cases:
- 'test_cmd'
# - 'test_cmd_tls_native_ssh'
- 'test_cmd_tls_native_ssh'
- 'test_upgrade'
- 'test_upgrade_tls'
- 'test_tikv_cdc'
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.21
- name: Set up Go 1.24
uses: actions/setup-go@v4
with:
go-version: 1.21.x
go-version: 1.24.x
id: go

- name: Check out code into the Go module directory
Expand All @@ -59,12 +60,22 @@ jobs:
run: |
export GOPATH=${GITHUB_WORKSPACE}/go
export PATH=$PATH:$GOPATH/bin
sudo apt-get update
sudo apt-get install -y build-essential python-is-python3 python3-pip ca-certificates curl
sudo install -m 0755 -d /etc/apt/keyrings
sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
sudo chmod a+r /etc/apt/keyrings/docker.asc
echo \
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
$(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
sudo apt-get update
sudo apt-get install -y docker-compose-plugin
make build_integration_test

- name: Build the docker-compose stack
working-directory: ${{ env.working-directory }}
# with --dev the first run will fail for unknow reason, just retry it and will success now..
run: TIUP_CLUSTER_ROOT=${{ env.working-directory }} ./docker/up.sh --daemon --dev || TIUP_CLUSTER_ROOT=${{ env.working-directory }} ./docker/up.sh --daemon --dev
run: TIUP_CLUSTER_ROOT=${{ env.working-directory }} ./docker/up.sh --daemon

- name: Check running containers
run: |
Expand Down Expand Up @@ -123,3 +134,10 @@ jobs:
curl -Os https://uploader.codecov.io/latest/linux/codecov
chmod +x codecov
./codecov -F cluster -s ${{ env.working-directory }}/tests/tiup-cluster/cover -f '*.out'

#- name: Setup tmate session
# uses: mxschmitt/action-tmate@v3
# if: ${{ failure() }}
# with:
# limit-access-to-actor: true

20 changes: 16 additions & 4 deletions .github/workflows/integrate-cluster-scale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ on:

jobs:
cluster:
runs-on: ubuntu-22.04
runs-on:
labels: arc-runner-set-docker-pingcap
strategy:
fail-fast: true
matrix:
Expand All @@ -43,10 +44,10 @@ jobs:
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.21
- name: Set up Go 1.24
uses: actions/setup-go@v4
with:
go-version: 1.21.x
go-version: 1.24.x
id: go

- name: Check out code into the Go module directory
Expand All @@ -59,12 +60,23 @@ jobs:
run: |
export GOPATH=${GITHUB_WORKSPACE}/go
export PATH=$PATH:$GOPATH/bin
sudo apt-get update
sudo apt-get install -y build-essential python-is-python3 python3-pip ca-certificates curl
sudo install -m 0755 -d /etc/apt/keyrings
sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
sudo chmod a+r /etc/apt/keyrings/docker.asc
echo \
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
$(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
sudo apt-get update
sudo apt-get install -y docker-compose-plugin
make build_integration_test

- name: Build the docker-compose stack
working-directory: ${{ env.working-directory }}
# with --dev the first run will fail for unknow reason, just retry it and will success now..
run: TIUP_CLUSTER_ROOT=${{ env.working-directory }} ./docker/up.sh --daemon --dev || TIUP_CLUSTER_ROOT=${{ env.working-directory }} ./docker/up.sh --daemon --dev
run: TIUP_CLUSTER_ROOT=${{ env.working-directory }} ./docker/up.sh --daemon

- name: Check running containers
run: |
Expand Down
20 changes: 16 additions & 4 deletions .github/workflows/integrate-dm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ on:

jobs:
dm:
runs-on: ubuntu-22.04
runs-on:
labels: arc-runner-set-docker-pingcap
strategy:
fail-fast: true
matrix:
Expand All @@ -42,10 +43,10 @@ jobs:
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.21
- name: Set up Go 1.24
uses: actions/setup-go@v4
with:
go-version: 1.21.x
go-version: 1.24.x
id: go

- name: Check out code into the Go module directory
Expand All @@ -59,6 +60,17 @@ jobs:
run: |
export GOPATH=${GITHUB_WORKSPACE}/go
export PATH=$PATH:$GOPATH/bin
sudo apt-get update
sudo apt-get install -y build-essential python-is-python3 python3-pip ca-certificates curl
sudo install -m 0755 -d /etc/apt/keyrings
sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
sudo chmod a+r /etc/apt/keyrings/docker.asc
echo \
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
$(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
sudo apt-get update
sudo apt-get install -y docker-compose-plugin
make build_integration_test
make tiup

Expand All @@ -67,7 +79,7 @@ jobs:
# with --dev the first run will fail for unknow reason, just retry it and will success now..
run: |
cd ${{ env.working-directory }}/docker
TIUP_CLUSTER_ROOT=${{ env.working-directory }} ./up.sh --daemon --dev --compose ./docker-compose.dm.yml
TIUP_CLUSTER_ROOT=${{ env.working-directory }} ./up.sh --daemon --compose ./docker-compose.dm.yml

- name: Check running containers
run: |
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/integrate-playground.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ on:

jobs:
playground:
runs-on: ubuntu-22.04
runs-on:
labels: arc-runner-set-docker-pingcap
timeout-minutes: 10
strategy:
fail-fast: true
Expand All @@ -41,10 +42,10 @@ jobs:
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.21
- name: Set up Go 1.24
uses: actions/setup-go@v4
with:
go-version: 1.21.x
go-version: 1.24.x
id: go

- name: Check out code into the Go module directory
Expand All @@ -57,6 +58,8 @@ jobs:
run: |
export GOPATH=${GITHUB_WORKSPACE}/go
export PATH=$PATH:$GOPATH/bin
sudo apt update
sudo apt-get install -y build-essential
make tiup build_tiup_playground_test

- name: Run test suite
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/integrate-tiup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ on:

jobs:
tiup:
runs-on: ubuntu-22.04
runs-on:
labels: arc-runner-set-docker-pingcap
timeout-minutes: 10
strategy:
fail-fast: true
Expand All @@ -45,10 +46,10 @@ jobs:
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.21
- name: Set up Go 1.24
uses: actions/setup-go@v4
with:
go-version: 1.21.x
go-version: 1.24.x
id: go

- name: Check out code into the Go module directory
Expand All @@ -62,6 +63,8 @@ jobs:
run: |
export GOPATH=${GITHUB_WORKSPACE}/go
export PATH=$PATH:$GOPATH/bin
sudo apt update
sudo apt-get install -y build-essential
make build_tiup_test

- name: Run test suite
Expand Down
19 changes: 3 additions & 16 deletions docker/control/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
FROM golang:1.21


# Use mirrors for poor network...
#RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list && \
# sed -i 's/security.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list
FROM golang:1.24

WORKDIR /tiup-cluster
COPY . /tiup-cluster/

# tiup-cluster dependencies
RUN apt-get -y -q update && \
Expand All @@ -15,21 +12,11 @@ FROM golang:1.21
psmisc \
vim # not required by tiup-cluster itself, just for ease of use


# without --dev flag up.sh copies tiup-cluster to these subfolders
# with --dev flag they are empty until mounted
COPY tiup-cluster/tiup-cluster /tiup-cluster/tiup-cluster/
COPY tiup-cluster /tiup-cluster/

ADD bashrc /root/.bashrc
ADD init.sh /init.sh
RUN dos2unix /init.sh /root/.bashrc && \
chmod +x /init.sh && \
mkdir -p /root/.ssh && \
echo "Host *\n ServerAliveInterval 30\n ServerAliveCountMax 3" >> /root/.ssh/config

# build tiup-cluster in without --dev flag
WORKDIR /tiup-cluster
RUN (test Makefile && make failpoint-enable && make cluster && make failpoint-disable) || true

CMD /init.sh
6 changes: 0 additions & 6 deletions docker/docker-compose.dev.yml

This file was deleted.

2 changes: 0 additions & 2 deletions docker/docker-compose.dm.yml.tpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.7"

services:
# https://hub.docker.com/_/mysql
mysql1:
Expand Down
1 change: 0 additions & 1 deletion docker/docker-compose.yml.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.7"
x-node: &default-node
build: ./node
env_file: ./secret/node.env
Expand Down
2 changes: 1 addition & 1 deletion docker/node/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Based on the deprecated `https://github.com/tutumcloud/tutum-debian`
FROM golang:1.17-bullseye
FROM golang:1.24-bullseye

# Use mirrors for poor network...
#RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list && \
Expand Down
Loading
Loading