From fbfe1487191a779409d577f544667214a87e3ec8 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Mon, 23 Sep 2024 18:24:16 +0200 Subject: [PATCH] fix missed conflicts Signed-off-by: Tim Vaillancourt --- .../upgrade_downgrade_test_query_serving_queries.yml | 9 --------- ...wngrade_test_query_serving_queries_next_release.yml | 9 --------- .../upgrade_downgrade_test_query_serving_schema.yml | 10 ---------- ...owngrade_test_query_serving_schema_next_release.yml | 10 ---------- .../upgrade_downgrade_test_reparent_new_vtctl.yml | 10 ---------- .../upgrade_downgrade_test_reparent_old_vtctl.yml | 10 ---------- .../upgrade_downgrade_test_reparent_old_vttablet.yml | 10 ---------- .github/workflows/vitess_tester_vtgate.yml | 10 ---------- .github/workflows/vtadmin_web_build.yml | 4 ---- .github/workflows/vtadmin_web_unit_tests.yml | 4 ---- 10 files changed, 86 deletions(-) diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml b/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml index 4947ec95c50..19a95815752 100644 --- a/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml +++ b/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml @@ -121,14 +121,6 @@ jobs: # install JUnit report formatter go install github.com/vitessio/go-junit-report@HEAD -<<<<<<< HEAD - wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb - sudo apt-get install -y gnupg2 - sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb - sudo percona-release enable-only pxb-24 - sudo apt-get update - sudo apt-get install -y percona-xtrabackup-24 -======= # Build current commit's binaries - name: Get dependencies for this commit if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' @@ -144,7 +136,6 @@ jobs: mkdir -p /tmp/vitess-build-current/ cp -R bin /tmp/vitess-build-current/ rm -Rf bin/* ->>>>>>> v19.0.6 # Checkout to the last release of Vitess - name: Check out other version's code (${{ steps.output-previous-release-ref.outputs.previous_release_ref }}) diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml b/.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml index 95232b001e2..a2c1fd5f960 100644 --- a/.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml +++ b/.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml @@ -115,14 +115,6 @@ jobs: # install JUnit report formatter go install github.com/vitessio/go-junit-report@HEAD -<<<<<<< HEAD - wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb - sudo apt-get install -y gnupg2 - sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb - sudo percona-release enable-only pxb-24 - sudo apt-get update - sudo apt-get install -y percona-xtrabackup-24 -======= # Build current commit's binaries - name: Get dependencies for this commit if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' @@ -138,7 +130,6 @@ jobs: mkdir -p /tmp/vitess-build-current/ cp -R bin /tmp/vitess-build-current/ rm -Rf bin/* ->>>>>>> v19.0.6 # Checkout to the next release of Vitess - name: Check out other version's code (${{ steps.output-next-release-ref.outputs.next_release_ref }}) diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml b/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml index bfd54a29bd0..c677dd42143 100644 --- a/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml +++ b/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml @@ -121,16 +121,6 @@ jobs: # install JUnit report formatter go install github.com/vitessio/go-junit-report@HEAD -<<<<<<< HEAD - wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb - sudo apt-get install -y gnupg2 - sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb - sudo percona-release enable-only pxb-24 - sudo apt-get update - sudo apt-get install -y percona-xtrabackup-24 - -======= ->>>>>>> v19.0.6 # Checkout to the last release of Vitess - name: Check out other version's code (${{ steps.output-previous-release-ref.outputs.previous_release_ref }}) if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_schema_next_release.yml b/.github/workflows/upgrade_downgrade_test_query_serving_schema_next_release.yml index 398f5c7a1a1..d97d797fd0e 100644 --- a/.github/workflows/upgrade_downgrade_test_query_serving_schema_next_release.yml +++ b/.github/workflows/upgrade_downgrade_test_query_serving_schema_next_release.yml @@ -115,16 +115,6 @@ jobs: # install JUnit report formatter go install github.com/vitessio/go-junit-report@HEAD -<<<<<<< HEAD - wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb - sudo apt-get install -y gnupg2 - sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb - sudo percona-release enable-only pxb-24 - sudo apt-get update - sudo apt-get install -y percona-xtrabackup-24 - -======= ->>>>>>> v19.0.6 # Checkout to the next release of Vitess - name: Check out other version's code (${{ steps.output-next-release-ref.outputs.next_release_ref }}) if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/upgrade_downgrade_test_reparent_new_vtctl.yml b/.github/workflows/upgrade_downgrade_test_reparent_new_vtctl.yml index 1e07d274812..a3ed0928e50 100644 --- a/.github/workflows/upgrade_downgrade_test_reparent_new_vtctl.yml +++ b/.github/workflows/upgrade_downgrade_test_reparent_new_vtctl.yml @@ -115,16 +115,6 @@ jobs: # install JUnit report formatter go install github.com/vitessio/go-junit-report@HEAD -<<<<<<< HEAD - wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb - sudo apt-get install -y gnupg2 - sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb - sudo percona-release enable-only pxb-24 - sudo apt-get update - sudo apt-get install -y percona-xtrabackup-24 - -======= ->>>>>>> v19.0.6 # Checkout to the next release of Vitess - name: Check out other version's code (${{ steps.output-next-release-ref.outputs.next_release_ref }}) if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml b/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml index 98db591ac53..c92f307acf7 100644 --- a/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml +++ b/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml @@ -121,16 +121,6 @@ jobs: # install JUnit report formatter go install github.com/vitessio/go-junit-report@HEAD -<<<<<<< HEAD - wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb - sudo apt-get install -y gnupg2 - sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb - sudo percona-release enable-only pxb-24 - sudo apt-get update - sudo apt-get install -y percona-xtrabackup-24 - -======= ->>>>>>> v19.0.6 # Checkout to the last release of Vitess - name: Check out other version's code (${{ steps.output-previous-release-ref.outputs.previous_release_ref }}) if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml b/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml index 0fce01dd939..d0e93fd25f8 100644 --- a/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml +++ b/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml @@ -121,16 +121,6 @@ jobs: # install JUnit report formatter go install github.com/vitessio/go-junit-report@HEAD -<<<<<<< HEAD - wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb - sudo apt-get install -y gnupg2 - sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb - sudo percona-release enable-only pxb-24 - sudo apt-get update - sudo apt-get install -y percona-xtrabackup-24 - -======= ->>>>>>> v19.0.6 # Checkout to the last release of Vitess - name: Check out other version's code (${{ steps.output-previous-release-ref.outputs.previous_release_ref }}) if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/vitess_tester_vtgate.yml b/.github/workflows/vitess_tester_vtgate.yml index af1345ff4b1..1551ee63475 100644 --- a/.github/workflows/vitess_tester_vtgate.yml +++ b/.github/workflows/vitess_tester_vtgate.yml @@ -119,11 +119,7 @@ jobs: go install github.com/vitessio/go-junit-report@HEAD # install vitess tester -<<<<<<< HEAD - go install github.com/vitessio/vitess-tester@eb953122baba163ed8ccaa6642458ee984f5d7e4 -======= go install github.com/vitessio/vitess-tester@89dd933a9ea0e15f69ca58b9c8ea09a358762cca ->>>>>>> v19.0.6 - name: Setup launchable dependencies if: steps.skip-workflow.outputs.is_draft == 'false' && steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' @@ -154,15 +150,9 @@ jobs: # We go over all the directories in the given path. # If there is a vschema file there, we use it, otherwise we let vitess-tester autogenerate it. if [ -f $dir/vschema.json ]; then -<<<<<<< HEAD - vitess-tester --sharded --xunit --test-dir $dir --vschema "$dir"vschema.json - else - vitess-tester --sharded --xunit --test-dir $dir -======= vitess-tester --xunit --vschema "$dir"vschema.json $dir/*.test else vitess-tester --sharded --xunit $dir/*.test ->>>>>>> v19.0.6 fi # Number the reports by changing their file names. mv report.xml report"$i".xml diff --git a/.github/workflows/vtadmin_web_build.yml b/.github/workflows/vtadmin_web_build.yml index e8bb24052c3..61cb452ec6d 100644 --- a/.github/workflows/vtadmin_web_build.yml +++ b/.github/workflows/vtadmin_web_build.yml @@ -16,12 +16,8 @@ permissions: read-all jobs: build: -<<<<<<< HEAD runs-on: group: vitess-ubuntu20 -======= - runs-on: ubuntu-latest ->>>>>>> v19.0.6 steps: - name: Skip CI run: | diff --git a/.github/workflows/vtadmin_web_unit_tests.yml b/.github/workflows/vtadmin_web_unit_tests.yml index 66f714b7fa5..c789e2fdc65 100644 --- a/.github/workflows/vtadmin_web_unit_tests.yml +++ b/.github/workflows/vtadmin_web_unit_tests.yml @@ -16,12 +16,8 @@ permissions: read-all jobs: unit-tests: -<<<<<<< HEAD runs-on: group: vitess-ubuntu20 -======= - runs-on: ubuntu-latest ->>>>>>> v19.0.6 steps: - name: Skip CI run: |