Skip to content

Commit 6ff63f7

Browse files
committed
Move yb-ctl to yugabyte repo
Summary: Making modifications in a secondary repo and pulling them in is tiring. It is not clear the separate repo benefits are worth this process. Test Plan: Run yb-ctl in dev repo. TODO: Build a package and verify yb-ctl works properly from within the package Reviewers: bogdan, mikhail, jason Subscribers: ybase Differential Revision: https://phabricator.dev.yugabyte.com/D8674
1 parent 94e2c3a commit 6ff63f7

File tree

7 files changed

+2459
-6
lines changed

7 files changed

+2459
-6
lines changed

.github/workflows/yb-ctl-test.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: yb-ctl-test
2+
3+
# Controls when the action will run. Triggers the workflow on push or pull request
4+
# events but only for the master branch
5+
on:
6+
push:
7+
branches:
8+
- master
9+
paths:
10+
- '**/yb-ctl*'
11+
12+
pull_request:
13+
branches:
14+
- master
15+
paths:
16+
- '**/yb-ctl*'
17+
18+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
19+
jobs:
20+
yb-ctl-test:
21+
runs-on: ${{ matrix.os }}
22+
23+
strategy:
24+
matrix:
25+
os: [ macos-latest, ubuntu-18.04 ]
26+
python-version: [ 2.7, 3.8 ]
27+
28+
steps:
29+
- name: Set up Python ${{ matrix.python-version }}
30+
uses: actions/setup-python@v2
31+
with:
32+
python-version: ${{ matrix.python-version }}
33+
34+
- uses: actions/checkout@v2
35+
36+
- name: Run yb-ctl-test
37+
run: |
38+
set -x
39+
tmpdir=$(mktemp -d)
40+
cp -r scripts/installation "${tmpdir}/"
41+
cd "${tmpdir}/installation"
42+
test/yb-ctl-test.sh

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "submodules/yugabyte-installation"]
2-
path = submodules/yugabyte-installation
3-
url = https://github.com/yugabyte/yugabyte-installation.git
41
[submodule "submodules/yugabyte-bash-common"]
52
path = submodules/yugabyte-bash-common
63
url = https://github.com/yugabyte/yugabyte-bash-common.git

bin/yb-ctl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ set -euo pipefail
2626
set_sanitizer_runtime_options
2727

2828
# Invoke the actual yb-ctl script.
29-
"$YB_SRC_ROOT"/submodules/yugabyte-installation/bin/yb-ctl "$@"
29+
"$YB_SRC_ROOT"/scripts/installation/bin/yb-ctl "$@"

0 commit comments

Comments
 (0)