diff --git a/.github/workflows/ci-e2e.yaml b/.github/workflows/ci-e2e.yaml index 891979ad..53e32b0d 100644 --- a/.github/workflows/ci-e2e.yaml +++ b/.github/workflows/ci-e2e.yaml @@ -14,11 +14,7 @@ concurrency: env: cache-version: 1 -# CI tests with the Cybozu internal use version plus the latest and one previous MySQL version. -# Other MySQL supported versions tested weekly. -# see: weekly.yaml -# -# NOTE: Current Cybozu internal use version is 8.0.28. +# CI tests with supported MySQL version. jobs: dbtest: name: Integration tests with MySQL diff --git a/.github/workflows/weekly.yaml b/.github/workflows/weekly.yaml deleted file mode 100644 index 86797d96..00000000 --- a/.github/workflows/weekly.yaml +++ /dev/null @@ -1,64 +0,0 @@ -name: Weekly E2E - -on: - schedule: - # 11:00 (JST) - - cron: '0 2 * * 1' - workflow_dispatch: - push: - branches: ["bump-v*"] - -env: - cache-version: 1 - -# Weekly E2E tests using all MySQL versions supported by MOCO -jobs: - dbtest: - name: Integration tests with MySQL - strategy: - matrix: - mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.4.0"] - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/dbtest - with: - mysql-version: ${{ matrix.mysql-version }} - - e2e: - name: Supported Kubernetes versions End-to-End Tests - strategy: - matrix: - mysql-version: ["8.4.0"] - k8s-version: ["1.27.13", "1.28.9", "1.29.4"] - runs-on: - group: moco - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/e2e - with: - k8s-version: ${{ matrix.k8s-version }} - mysql-version: ${{ matrix.mysql-version }} - - e2e-mysql: - name: Supported MySQL versions End-to-End Tests - strategy: - matrix: - mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.4.0"] - k8s-version: ["1.29.4"] - runs-on: - group: moco - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/e2e - with: - k8s-version: ${{ matrix.k8s-version }} - mysql-version: ${{ matrix.mysql-version }} - - upgrade: - name: Upgrade Test - runs-on: - group: moco - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/upgrade diff --git a/DEVELOP.md b/DEVELOP.md index d8fe9b6f..708b1266 100644 --- a/DEVELOP.md +++ b/DEVELOP.md @@ -26,10 +26,6 @@ To run these tests, use the following make targets respectively: 3. `make envtest` 4. Read [`e2e/README.md`](e2e/README.md) -MOCO supports multiple MySQL versions. -The three MySQL versions always used by CI are Cybozu internal use version, the latest, and one version before the latest. -Other supported MySQL versions will be [tested only in Weekly](.github/workflows/weekly.yaml). - ## Generated files Some files in the repository are auto-generated.