diff --git a/.github/workflows/cluster_endtoend_12.yml b/.github/workflows/cluster_endtoend_12.yml index f16746aa1dd..56872e85d93 100644 --- a/.github/workflows/cluster_endtoend_12.yml +++ b/.github/workflows/cluster_endtoend_12.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_13.yml b/.github/workflows/cluster_endtoend_13.yml index d62f5e4feb8..aac7c99962d 100644 --- a/.github/workflows/cluster_endtoend_13.yml +++ b/.github/workflows/cluster_endtoend_13.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_15.yml b/.github/workflows/cluster_endtoend_15.yml index 432c37df532..f8cc49f57a0 100644 --- a/.github/workflows/cluster_endtoend_15.yml +++ b/.github/workflows/cluster_endtoend_15.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_18.yml b/.github/workflows/cluster_endtoend_18.yml index a634397ed44..e54d124fe68 100644 --- a/.github/workflows/cluster_endtoend_18.yml +++ b/.github/workflows/cluster_endtoend_18.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_21.yml b/.github/workflows/cluster_endtoend_21.yml index e4ae4289694..a976f305d49 100644 --- a/.github/workflows/cluster_endtoend_21.yml +++ b/.github/workflows/cluster_endtoend_21.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_backup_pitr.yml b/.github/workflows/cluster_endtoend_backup_pitr.yml index 56567d65d2f..8c1eb650194 100644 --- a/.github/workflows/cluster_endtoend_backup_pitr.yml +++ b/.github/workflows/cluster_endtoend_backup_pitr.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_backup_pitr_mysqlshell.yml b/.github/workflows/cluster_endtoend_backup_pitr_mysqlshell.yml index 8c12399a0f2..0a1855593cf 100644 --- a/.github/workflows/cluster_endtoend_backup_pitr_mysqlshell.yml +++ b/.github/workflows/cluster_endtoend_backup_pitr_mysqlshell.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml b/.github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml index c737ff7668c..c84194934f1 100644 --- a/.github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml +++ b/.github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml @@ -98,9 +98,7 @@ jobs: sudo apt-get -qq install -y percona-xtrabackup-80 lz4 # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml b/.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml index c81ba9cf3b7..5ddbffe6fdd 100644 --- a/.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml +++ b/.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_mysql84.yml b/.github/workflows/cluster_endtoend_mysql84.yml index 9ced6f5c1b8..22c4fcffbe4 100644 --- a/.github/workflows/cluster_endtoend_mysql84.yml +++ b/.github/workflows/cluster_endtoend_mysql84.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_mysql_server_vault.yml b/.github/workflows/cluster_endtoend_mysql_server_vault.yml index b1677e2b379..40e628dae14 100644 --- a/.github/workflows/cluster_endtoend_mysql_server_vault.yml +++ b/.github/workflows/cluster_endtoend_mysql_server_vault.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_onlineddl_revert.yml b/.github/workflows/cluster_endtoend_onlineddl_revert.yml index 906530b59b1..462e18bab30 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_revert.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_revert.yml @@ -90,9 +90,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_onlineddl_scheduler.yml b/.github/workflows/cluster_endtoend_onlineddl_scheduler.yml index 7f44501ceb6..63a0a06845a 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_scheduler.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_scheduler.yml @@ -90,9 +90,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml index ee9b832c391..17c6a8e77dd 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml @@ -90,9 +90,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml index 6b94a4436d8..161b0c4d411 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml @@ -90,9 +90,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml index d0051d174c8..32ca5d35d20 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml @@ -90,9 +90,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml index 8b7675b70aa..a4be430b8a5 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml @@ -90,9 +90,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml b/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml index 389084e47ca..355c538ebb5 100644 --- a/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml +++ b/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml @@ -90,9 +90,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_tabletmanager_consul.yml b/.github/workflows/cluster_endtoend_tabletmanager_consul.yml index 591734703ef..d9ae315c9ae 100644 --- a/.github/workflows/cluster_endtoend_tabletmanager_consul.yml +++ b/.github/workflows/cluster_endtoend_tabletmanager_consul.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml index f52320e88a3..26d8a2963e0 100644 --- a/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml +++ b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_tabletmanager_throttler_topo.yml b/.github/workflows/cluster_endtoend_tabletmanager_throttler_topo.yml index b23999b3281..cab07092d1e 100644 --- a/.github/workflows/cluster_endtoend_tabletmanager_throttler_topo.yml +++ b/.github/workflows/cluster_endtoend_tabletmanager_throttler_topo.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_topo_connection_cache.yml b/.github/workflows/cluster_endtoend_topo_connection_cache.yml index eb15d3c0a6e..8ab6f1f9384 100644 --- a/.github/workflows/cluster_endtoend_topo_connection_cache.yml +++ b/.github/workflows/cluster_endtoend_topo_connection_cache.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml b/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml index 8e69b999d66..5372f836cad 100644 --- a/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml +++ b/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vreplication_basic.yml b/.github/workflows/cluster_endtoend_vreplication_basic.yml index 2a110997d0a..0d4515bfc02 100644 --- a/.github/workflows/cluster_endtoend_vreplication_basic.yml +++ b/.github/workflows/cluster_endtoend_vreplication_basic.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vreplication_cellalias.yml b/.github/workflows/cluster_endtoend_vreplication_cellalias.yml index 60aaa560799..b4b573aa10d 100644 --- a/.github/workflows/cluster_endtoend_vreplication_cellalias.yml +++ b/.github/workflows/cluster_endtoend_vreplication_cellalias.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml b/.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml index 949f37c3b9b..eedf24000b0 100644 --- a/.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml +++ b/.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml b/.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml index 4deda4580e9..79009bfbb7f 100644 --- a/.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml +++ b/.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml b/.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml index 685a8f1e789..e586fa76c36 100644 --- a/.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml +++ b/.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vreplication_migrate.yml b/.github/workflows/cluster_endtoend_vreplication_migrate.yml index 42183724482..b166d54ae87 100644 --- a/.github/workflows/cluster_endtoend_vreplication_migrate.yml +++ b/.github/workflows/cluster_endtoend_vreplication_migrate.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml b/.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml index 96b23384d30..51eb2fa763a 100644 --- a/.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml +++ b/.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml b/.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml index d88be2431b8..b49290214e6 100644 --- a/.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml +++ b/.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vreplication_v2.yml b/.github/workflows/cluster_endtoend_vreplication_v2.yml index a68dbdd2617..f41043a1447 100644 --- a/.github/workflows/cluster_endtoend_vreplication_v2.yml +++ b/.github/workflows/cluster_endtoend_vreplication_v2.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vreplication_vdiff2.yml b/.github/workflows/cluster_endtoend_vreplication_vdiff2.yml index f1a0fda43d3..61e7eed8950 100644 --- a/.github/workflows/cluster_endtoend_vreplication_vdiff2.yml +++ b/.github/workflows/cluster_endtoend_vreplication_vdiff2.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vreplication_vtctldclient_movetables_tz.yml b/.github/workflows/cluster_endtoend_vreplication_vtctldclient_movetables_tz.yml index a92793e8eba..8f6caafbfbb 100644 --- a/.github/workflows/cluster_endtoend_vreplication_vtctldclient_movetables_tz.yml +++ b/.github/workflows/cluster_endtoend_vreplication_vtctldclient_movetables_tz.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vstream.yml b/.github/workflows/cluster_endtoend_vstream.yml index 2ef5db730d5..f589d82a3ba 100644 --- a/.github/workflows/cluster_endtoend_vstream.yml +++ b/.github/workflows/cluster_endtoend_vstream.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtbackup.yml b/.github/workflows/cluster_endtoend_vtbackup.yml index 6d850785d81..dff12587cdc 100644 --- a/.github/workflows/cluster_endtoend_vtbackup.yml +++ b/.github/workflows/cluster_endtoend_vtbackup.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml b/.github/workflows/cluster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml index 23d63c9e01e..0fec4c34a47 100644 --- a/.github/workflows/cluster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml +++ b/.github/workflows/cluster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml b/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml index 0f57811b276..71035c61190 100644 --- a/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml +++ b/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_foreignkey_stress.yml b/.github/workflows/cluster_endtoend_vtgate_foreignkey_stress.yml index c5b830189fb..5ffd42c4345 100644 --- a/.github/workflows/cluster_endtoend_vtgate_foreignkey_stress.yml +++ b/.github/workflows/cluster_endtoend_vtgate_foreignkey_stress.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_gen4.yml b/.github/workflows/cluster_endtoend_vtgate_gen4.yml index e697aabe3fe..c92f0a87f52 100644 --- a/.github/workflows/cluster_endtoend_vtgate_gen4.yml +++ b/.github/workflows/cluster_endtoend_vtgate_gen4.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_general_heavy.yml b/.github/workflows/cluster_endtoend_vtgate_general_heavy.yml index 3f34a7d51f0..cbb59fe2042 100644 --- a/.github/workflows/cluster_endtoend_vtgate_general_heavy.yml +++ b/.github/workflows/cluster_endtoend_vtgate_general_heavy.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_godriver.yml b/.github/workflows/cluster_endtoend_vtgate_godriver.yml index 4817fc3ad83..955111395e2 100644 --- a/.github/workflows/cluster_endtoend_vtgate_godriver.yml +++ b/.github/workflows/cluster_endtoend_vtgate_godriver.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml b/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml index 6a375f03cdd..e963842f6a7 100644 --- a/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml +++ b/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_plantests.yml b/.github/workflows/cluster_endtoend_vtgate_plantests.yml index f73cdbd76f1..a2641ab8a75 100644 --- a/.github/workflows/cluster_endtoend_vtgate_plantests.yml +++ b/.github/workflows/cluster_endtoend_vtgate_plantests.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_queries.yml b/.github/workflows/cluster_endtoend_vtgate_queries.yml index f57af76676f..ff6fa05955d 100644 --- a/.github/workflows/cluster_endtoend_vtgate_queries.yml +++ b/.github/workflows/cluster_endtoend_vtgate_queries.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml b/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml index 8a25d16ece4..2071eea7cd6 100644 --- a/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml +++ b/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml b/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml index f399842804c..993b981ccab 100644 --- a/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml +++ b/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_schema.yml b/.github/workflows/cluster_endtoend_vtgate_schema.yml index f64a8428f82..27cebfa592e 100644 --- a/.github/workflows/cluster_endtoend_vtgate_schema.yml +++ b/.github/workflows/cluster_endtoend_vtgate_schema.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_schema_tracker.yml b/.github/workflows/cluster_endtoend_vtgate_schema_tracker.yml index e72496d553b..325bf5cb351 100644 --- a/.github/workflows/cluster_endtoend_vtgate_schema_tracker.yml +++ b/.github/workflows/cluster_endtoend_vtgate_schema_tracker.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_tablet_healthcheck_cache.yml b/.github/workflows/cluster_endtoend_vtgate_tablet_healthcheck_cache.yml index 63d8c7790aa..a6bcbd1fd17 100644 --- a/.github/workflows/cluster_endtoend_vtgate_tablet_healthcheck_cache.yml +++ b/.github/workflows/cluster_endtoend_vtgate_tablet_healthcheck_cache.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_topo.yml b/.github/workflows/cluster_endtoend_vtgate_topo.yml index 1775c16ea3e..d5afd255791 100644 --- a/.github/workflows/cluster_endtoend_vtgate_topo.yml +++ b/.github/workflows/cluster_endtoend_vtgate_topo.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_topo_consul.yml b/.github/workflows/cluster_endtoend_vtgate_topo_consul.yml index 392bb87b442..11b63e2f46d 100644 --- a/.github/workflows/cluster_endtoend_vtgate_topo_consul.yml +++ b/.github/workflows/cluster_endtoend_vtgate_topo_consul.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_topo_etcd.yml b/.github/workflows/cluster_endtoend_vtgate_topo_etcd.yml index 89d402b2f1f..778e0edeee1 100644 --- a/.github/workflows/cluster_endtoend_vtgate_topo_etcd.yml +++ b/.github/workflows/cluster_endtoend_vtgate_topo_etcd.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_transaction.yml b/.github/workflows/cluster_endtoend_vtgate_transaction.yml index c1c9ad6841f..04c76ae98bb 100644 --- a/.github/workflows/cluster_endtoend_vtgate_transaction.yml +++ b/.github/workflows/cluster_endtoend_vtgate_transaction.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_unsharded.yml b/.github/workflows/cluster_endtoend_vtgate_unsharded.yml index 78b2c9b3a1c..edfbe099466 100644 --- a/.github/workflows/cluster_endtoend_vtgate_unsharded.yml +++ b/.github/workflows/cluster_endtoend_vtgate_unsharded.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_vindex_heavy.yml b/.github/workflows/cluster_endtoend_vtgate_vindex_heavy.yml index 27cc7f08192..ffbd479b0a8 100644 --- a/.github/workflows/cluster_endtoend_vtgate_vindex_heavy.yml +++ b/.github/workflows/cluster_endtoend_vtgate_vindex_heavy.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtgate_vschema.yml b/.github/workflows/cluster_endtoend_vtgate_vschema.yml index a11ff22fb77..15e66ea5ab9 100644 --- a/.github/workflows/cluster_endtoend_vtgate_vschema.yml +++ b/.github/workflows/cluster_endtoend_vtgate_vschema.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vtorc.yml b/.github/workflows/cluster_endtoend_vtorc.yml index 295e9fe4bea..f50d8658fe7 100644 --- a/.github/workflows/cluster_endtoend_vtorc.yml +++ b/.github/workflows/cluster_endtoend_vtorc.yml @@ -98,9 +98,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_vttablet_prscomplex.yml b/.github/workflows/cluster_endtoend_vttablet_prscomplex.yml index fe28e2ec512..fc81cc0147a 100644 --- a/.github/workflows/cluster_endtoend_vttablet_prscomplex.yml +++ b/.github/workflows/cluster_endtoend_vttablet_prscomplex.yml @@ -89,9 +89,7 @@ jobs: sudo apt-get -qq install -y mysql-shell # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_xb_backup.yml b/.github/workflows/cluster_endtoend_xb_backup.yml index 9541c096625..e54df331afe 100644 --- a/.github/workflows/cluster_endtoend_xb_backup.yml +++ b/.github/workflows/cluster_endtoend_xb_backup.yml @@ -98,9 +98,7 @@ jobs: sudo apt-get -qq install -y percona-xtrabackup-80 lz4 # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/cluster_endtoend_xb_recovery.yml b/.github/workflows/cluster_endtoend_xb_recovery.yml index fe34e39f3a0..c37cd2a3ccf 100644 --- a/.github/workflows/cluster_endtoend_xb_recovery.yml +++ b/.github/workflows/cluster_endtoend_xb_recovery.yml @@ -98,9 +98,7 @@ jobs: sudo apt-get -qq install -y percona-xtrabackup-80 lz4 # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 1768dcdfc73..6b89cebca8c 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -65,10 +65,6 @@ jobs: sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk - mkdir -p dist bin - curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/ - go mod download go install golang.org/x/tools/cmd/goimports@034e59c473362f8f2be47694d98fd3f12a1ad497 # v0.39.0 diff --git a/.github/workflows/unit_race.yml b/.github/workflows/unit_race.yml index a82e60e10a9..c31c4e54105 100644 --- a/.github/workflows/unit_race.yml +++ b/.github/workflows/unit_race.yml @@ -84,10 +84,6 @@ jobs: sudo apt-get -qq install -y make unzip g++ curl git wget ant openjdk-11-jdk - mkdir -p dist bin - curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/ - go mod download go install golang.org/x/tools/cmd/goimports@034e59c473362f8f2be47694d98fd3f12a1ad497 # v0.39.0 diff --git a/.github/workflows/unit_race_evalengine.yml b/.github/workflows/unit_race_evalengine.yml index 2d84abd8110..2abf07b4b63 100644 --- a/.github/workflows/unit_race_evalengine.yml +++ b/.github/workflows/unit_race_evalengine.yml @@ -84,10 +84,6 @@ jobs: sudo apt-get -qq install -y make unzip g++ curl git wget ant openjdk-11-jdk - mkdir -p dist bin - curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/ - go mod download go install golang.org/x/tools/cmd/goimports@034e59c473362f8f2be47694d98fd3f12a1ad497 # v0.39.0 diff --git a/.github/workflows/unit_test_evalengine_mysql57.yml b/.github/workflows/unit_test_evalengine_mysql57.yml index 2f744a8bc5a..6d3c7fc92d9 100644 --- a/.github/workflows/unit_test_evalengine_mysql57.yml +++ b/.github/workflows/unit_test_evalengine_mysql57.yml @@ -84,10 +84,6 @@ jobs: export DEBIAN_FRONTEND="noninteractive" sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk - mkdir -p dist bin - curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/ - go mod download go install golang.org/x/tools/cmd/goimports@034e59c473362f8f2be47694d98fd3f12a1ad497 # v0.39.0 diff --git a/.github/workflows/unit_test_evalengine_mysql80.yml b/.github/workflows/unit_test_evalengine_mysql80.yml index a8a44c063e5..1535720e3fd 100644 --- a/.github/workflows/unit_test_evalengine_mysql80.yml +++ b/.github/workflows/unit_test_evalengine_mysql80.yml @@ -84,10 +84,6 @@ jobs: export DEBIAN_FRONTEND="noninteractive" sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk - mkdir -p dist bin - curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/ - go mod download go install golang.org/x/tools/cmd/goimports@034e59c473362f8f2be47694d98fd3f12a1ad497 # v0.39.0 diff --git a/.github/workflows/unit_test_evalengine_mysql84.yml b/.github/workflows/unit_test_evalengine_mysql84.yml index b85f24e8e3b..62f3921bb7f 100644 --- a/.github/workflows/unit_test_evalengine_mysql84.yml +++ b/.github/workflows/unit_test_evalengine_mysql84.yml @@ -84,10 +84,6 @@ jobs: export DEBIAN_FRONTEND="noninteractive" sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk - mkdir -p dist bin - curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/ - go mod download go install golang.org/x/tools/cmd/goimports@034e59c473362f8f2be47694d98fd3f12a1ad497 # v0.39.0 diff --git a/.github/workflows/unit_test_mysql57.yml b/.github/workflows/unit_test_mysql57.yml index 3bd54059024..0ae68e131e5 100644 --- a/.github/workflows/unit_test_mysql57.yml +++ b/.github/workflows/unit_test_mysql57.yml @@ -84,10 +84,6 @@ jobs: export DEBIAN_FRONTEND="noninteractive" sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk - mkdir -p dist bin - curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/ - go mod download go install golang.org/x/tools/cmd/goimports@034e59c473362f8f2be47694d98fd3f12a1ad497 # v0.39.0 diff --git a/.github/workflows/unit_test_mysql80.yml b/.github/workflows/unit_test_mysql80.yml index 7325bc902b9..2ea2ad64c68 100644 --- a/.github/workflows/unit_test_mysql80.yml +++ b/.github/workflows/unit_test_mysql80.yml @@ -84,10 +84,6 @@ jobs: export DEBIAN_FRONTEND="noninteractive" sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk - mkdir -p dist bin - curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/ - go mod download go install golang.org/x/tools/cmd/goimports@034e59c473362f8f2be47694d98fd3f12a1ad497 # v0.39.0 diff --git a/.github/workflows/unit_test_mysql84.yml b/.github/workflows/unit_test_mysql84.yml index 45b31fb61ca..72b3386d75f 100644 --- a/.github/workflows/unit_test_mysql84.yml +++ b/.github/workflows/unit_test_mysql84.yml @@ -84,10 +84,6 @@ jobs: export DEBIAN_FRONTEND="noninteractive" sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk - mkdir -p dist bin - curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/ - go mod download go install golang.org/x/tools/cmd/goimports@034e59c473362f8f2be47694d98fd3f12a1ad497 # v0.39.0 diff --git a/test.go b/test.go index 76247ac4216..5cb01a051cf 100755 --- a/test.go +++ b/test.go @@ -176,6 +176,8 @@ func (t *Test) run(dir, dataDir string) ([]byte, error) { t.pass++ return nil, nil } + + envPath := os.Getenv("PATH") testCmd := t.Command if len(testCmd) == 0 { if strings.Contains(fmt.Sprintf("%v", t.File), ".go") { @@ -218,7 +220,9 @@ func (t *Test) run(dir, dataDir string) ([]byte, error) { // Put everything in a unique dir, so we can copy and/or safely delete it. // Also try to make them use different port ranges // to mitigate failures due to zombie processes. + binDir := filepath.Join(dir, "bin") cmd.Env = updateEnv(os.Environ(), map[string]string{ + "PATH": binDir + ":" + envPath, "VTROOT": "/vt/src/vitess.io/vitess", "VTDATAROOT": dataDir, "VTPORTSTART": strconv.FormatInt(int64(getPortStart(100)), 10), diff --git a/test/templates/cluster_endtoend_test.tpl b/test/templates/cluster_endtoend_test.tpl index f9ca84d7808..4ed72def395 100644 --- a/test/templates/cluster_endtoend_test.tpl +++ b/test/templates/cluster_endtoend_test.tpl @@ -134,9 +134,7 @@ jobs: {{end}} # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download diff --git a/test/templates/cluster_endtoend_test_mysql57.tpl b/test/templates/cluster_endtoend_test_mysql57.tpl index 27f90edf159..9d730904dc7 100644 --- a/test/templates/cluster_endtoend_test_mysql57.tpl +++ b/test/templates/cluster_endtoend_test_mysql57.tpl @@ -111,9 +111,7 @@ jobs: run: | sudo apt-get update - sudo apt-get install -y make unzip g++ etcd-client etcd-server curl git wget - - sudo service etcd stop + sudo apt-get install -y make unzip g++ curl git wget # install JUnit report formatter go install github.com/vitessio/go-junit-report@{{.GoJunitReport.SHA}} # {{.GoJunitReport.Comment}} @@ -137,7 +135,7 @@ jobs: {{if .MakeTools}} - - name: Installing zookeeper and consul + - name: Installing etcd, consul and zookeeper if: steps.changes.outputs.end_to_end == 'true' run: | make tools diff --git a/test/templates/cluster_vitess_tester.tpl b/test/templates/cluster_vitess_tester.tpl index 274ff3bee61..1dbcbe47490 100644 --- a/test/templates/cluster_vitess_tester.tpl +++ b/test/templates/cluster_vitess_tester.tpl @@ -91,9 +91,7 @@ jobs: sudo apt-get -qq update # Install everything else we need, and configure - sudo apt-get -qq install -y make unzip g++ etcd-client etcd-server curl git wget xz-utils libncurses6 - - sudo service etcd stop + sudo apt-get -qq install -y make unzip g++ curl git wget xz-utils libncurses6 go mod download @@ -103,6 +101,15 @@ jobs: # install vitess tester go install github.com/vitessio/vt/go/vt@e43009309f599378504905d4b804460f47822ac5 + {{if .MakeTools}} + + - name: Installing etcd, consul and zookeeper + if: steps.changes.outputs.end_to_end == 'true' + run: | + make tools + + {{end}} + - name: Setup launchable dependencies if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' run: | diff --git a/test/templates/unit_test.tpl b/test/templates/unit_test.tpl index 44c81fb4aba..1d3b623878a 100644 --- a/test/templates/unit_test.tpl +++ b/test/templates/unit_test.tpl @@ -97,10 +97,6 @@ jobs: export DEBIAN_FRONTEND="noninteractive" sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk - mkdir -p dist bin - curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/ - go mod download go install golang.org/x/tools/cmd/goimports@{{.Goimports.SHA}} # {{.Goimports.Comment}}