Skip to content

Commit

Permalink
Move yb-ctl to the yugabyte-db repo
Browse files Browse the repository at this point in the history
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. Built a package and verify yb-ctl works properly from
within the package

https://github.com/iSignal/yugabyte-db/pull/7/checks has the results of the workflow run.

Reviewers: bogdan, jason, mikhail

Reviewed By: mikhail

Subscribers: ybase

Differential Revision: https://phabricator.dev.yugabyte.com/D8674
  • Loading branch information
iSignal committed Jun 29, 2020
1 parent e375c7b commit b5ae7c4
Show file tree
Hide file tree
Showing 7 changed files with 2,459 additions and 6 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/yb-ctl-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: yb-ctl-test

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
push:
branches:
- master
paths:
- '**/yb-ctl*'

pull_request:
branches:
- master
paths:
- '**/yb-ctl*'

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
yb-ctl-test:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [ macos-latest, ubuntu-18.04 ]
python-version: [ 2.7, 3.8 ]

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- uses: actions/checkout@v2

- name: Run yb-ctl-test
run: |
set -x
tmpdir=$(mktemp -d)
cp -r scripts/installation "${tmpdir}/"
cd "${tmpdir}/installation"
test/yb-ctl-test.sh
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "submodules/yugabyte-installation"]
path = submodules/yugabyte-installation
url = https://github.com/yugabyte/yugabyte-installation.git
[submodule "submodules/yugabyte-bash-common"]
path = submodules/yugabyte-bash-common
url = https://github.com/yugabyte/yugabyte-bash-common.git
Expand Down
2 changes: 1 addition & 1 deletion bin/yb-ctl
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ set -euo pipefail
set_sanitizer_runtime_options

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

0 comments on commit b5ae7c4

Please sign in to comment.