diff --git a/.github/workflows/ci-basictests.yml b/.github/workflows/ci-basictests.yml index 322b9ad43..3dee5c7ce 100644 --- a/.github/workflows/ci-basictests.yml +++ b/.github/workflows/ci-basictests.yml @@ -17,7 +17,7 @@ on: workflow_dispatch: jobs: - basictest: + build-n-test: runs-on: ubuntu-22.04 steps: @@ -137,11 +137,6 @@ jobs: #rm -f multiple_prepared_statements-t #rm -f mysql-mirror1-t - - name: Docker-hoster - run: | - cd ${{ github.workspace }}/jenkins-build-scripts/infra-docker-hoster - docker-compose up -d - - name: Run proxysql run: | set -x @@ -168,14 +163,16 @@ jobs: run: | cd ${{ github.workspace }}/jenkins-build-scripts source ./env.sh - cd ${{ github.workspace }}/jenkins-build-scripts/infra-mysql57 + cd ${{ github.workspace }}/jenkins-build-scripts/infra-docker-hoster + #docker-compose up -d + ./docker-compose-init.bash + + cd ${{ github.workspace }}/jenkins-build-scripts/infra-mysql57 sed -i "s/\${INFRA}-\${CONTAINER}-1/\${INFRA}_\${CONTAINER}_1/" docker-compose-init.bash ./docker-compose-init.bash - docker ps -a - cat /etc/hosts - - name: Run tests + - name: Basic tests run: | set +e cd ${{ github.workspace }}/jenkins-build-scripts