Skip to content
This repository was archived by the owner on Apr 13, 2020. It is now read-only.
Merged
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
f6af60d
initial proposal for merging spk
sarath-p Mar 12, 2020
c8cad6e
Merge branch 'master' into repomerge
sarath-p Mar 12, 2020
1912637
added testing section in phase 2
sarath-p Mar 12, 2020
acb88f6
updated wording in phase 4
sarath-p Mar 12, 2020
1685d30
Update repos-merge.md
andrebriggs Mar 12, 2020
6b7ebc9
updated sections
sarath-p Mar 12, 2020
307c070
testing colors
sarath-p Mar 12, 2020
ce5b977
testing colors
sarath-p Mar 12, 2020
e885cf8
testing colors
sarath-p Mar 12, 2020
a6bd8d9
testing colors
sarath-p Mar 12, 2020
dc9f744
Merge branch 'master' into repomerge
sarath-p Mar 12, 2020
58827b6
Merge branch 'master' into repomerge
NathanielRose Mar 13, 2020
7458c7c
Updated with the feedback
sarath-p Mar 16, 2020
1629d6c
Merge branch 'master' into repomerge
sarath-p Mar 16, 2020
a88195b
Merge branch 'repomerge' of https://github.com/CatalystCode/spk into …
sarath-p Mar 16, 2020
0997ff4
Added publishing dir
sarath-p Mar 16, 2020
6845c07
Added publishing dir
sarath-p Mar 16, 2020
7440d52
Merge branch 'master' into repomerge
NathanielRose Mar 17, 2020
a0f5bf8
Merge branch 'master' into repomerge
NathanielRose Mar 17, 2020
313c3f2
merging master
sarath-p Mar 17, 2020
4c26cb6
Incorporated feedback
sarath-p Mar 17, 2020
f0e0766
Merging master
sarath-p Mar 18, 2020
a166c16
Merge branch 'master' into repomerge
dennisseah Mar 19, 2020
33f96ea
merging master
sarath-p Mar 20, 2020
92b2cee
removed additional phases to address in a future task
sarath-p Mar 20, 2020
84689a1
updated section
sarath-p Mar 20, 2020
974e4f3
Merge branch 'master' into repomerge
andrebriggs Mar 22, 2020
3eb2bee
Merging master
sarath-p Mar 23, 2020
de84b1a
pulling changes
sarath-p Mar 23, 2020
54d1803
Merging master
sarath-p Mar 23, 2020
d6bb8f5
reverting a file
sarath-p Mar 23, 2020
8e5daa4
Merge branch 'master' into repomerge
NathanielRose Mar 23, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
207 changes: 207 additions & 0 deletions technical-docs/designs/repos-merge.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
# Moving SPK to Bedrock Repo: A Phased Approach

## Phase 1: Prep work before moving SPK to Bedrock Repo

### Bedrock Repo Changes

By making following changes in existing Bedrock repo minimizes the number of
changes after the merge and limits the testing scope.

#### Current Bedrock Repo

```
├── .github
├── cluster
├── docs
├── gitops
├── pipelines
├── test
├── tools
├── LICENSE
├── README.md
├── .gitignore
├── azure-pipelines.yml
```

#### Proposed Changes

- Create `src` folder in `cluster` folder
Comment thread
sarath-p marked this conversation as resolved.
- Move all files and folders except `src` from `cluster` to `cluster\src`
- Move `azure-pipelines.yml` file from the root to `cluster\build\pipelines`
directory and make sure all pipelines still works.
- Move `test` folder to `cluster` folder and make sure all tests and pipelines
still works.
- Move `bedrock` related files from `tools` directory to `cluster\build` folder
and make sure existing Bedrock release process still works.
- [ ] Move following files form the `root` directory to `cluster` and make sure
Comment thread
sarath-p marked this conversation as resolved.
`cluster` project can be opened in VS Code.
- LICENSE
- .gitignore

#### Testing

After making the above changes, need to make sure that the follwing tests pass.

- Verify the environments integration tests continue to work in `azdo`
- Verify `bedrock` release provess work
- Verify the project can be opened in VS Code from the `cluster` folder

#### Bedrock repo after changes

`Bedrock` repo would look like below after implementing the above changes.

```
├── .github
├── gitops
├── cluster
├── build
├── pipelines
├── azure-pipelines.yml
├── tools
├── docs
├── src
Comment thread
sarath-p marked this conversation as resolved.
├── test
Comment thread
sarath-p marked this conversation as resolved.
├── LICENSE
├── README.md
├── .gitignore

Comment thread
sarath-p marked this conversation as resolved.
```

### SPK Repo Changes

Making following changes in existing SPK repo minimizes the number of changes
after the merge and limits the testing scope to SPK functioanlity.

#### Current SPK repo

```
├── .github
├── azure-pipelines
├── templates
├── docs
├── commands
├── guides
├── patches
├── scripts
├── src
├── technical-docs
├── designs
├── tests
├── tools
├── typings
├── ssh-url
├── .editorconfig
├── .env.example
├── .gitignore
├── CHANGELOG.md
├── README.md
├── azure-pipelines.yml
├── jest.config.js
├── package.json
├── release-pipeline.yml
├── smoke-test-pipeline.yml
├── spk-config.yaml
├── tsconfig.json
├── tslint.json
├── typings
├── webpack.config.js
├── .yarn.lock
```

#### Themes

The main themes are related to organizing `docs` and `build` related artifacts
in `spk` from the root to appropriate directories.

1. Organize all pipeline yaml files, scripts, and tools that are related to
building and releasing binaries under `build` directory.

2. Organize all docs that are related to using and contributing bedrock under
`docs` directory.

#### Proposed Changes

The majority of the proposed changes in `spk` repo are related to organizing
`docs` and `build` folders.

- Move following files from the `root` to `build\pipelines` folder and make sure
Comment thread
sarath-p marked this conversation as resolved.
all pipelines continue to work.
- azure-pipelines.yml
- release-pipeline.yml
- smoke-test-pipeline.yml
- Move following files from the `scripts` to `build\publishing` folder and
verify the scripts generate `command` docs.
- generateDoc.ts
- locateAliases.ts
- Move `patches` directory to `build\patches` folder and make sure `yarn build`
and `yarn test` continue to work.
- Move `azure-pipelines\templates` folder to `build\pipelines\templates` folder
and verify all pipelines continue to work.
- Move `guides\contributing.md` file to `documents\contribution` folder
- Move `guides` folder to `documents` folder
- Move `technical-docs\designs` to `documents\contribution\designs` folder
- Remove `.github\workflows` folder since it is not being used

#### Testing

After making the above changes, need to make sure that the follwing tests pass.

- Verify cli build pipeline is working
- Verify cli integration test pipeline is working
- Verify cli release pipeline is working
- Verify cli autogenerated docs are working on GitHub pages
- Verify all docs links are working

#### SPK repo after changes

`spk` repo would look like below after implementing the above changes.

```
├── build
├── pipelines
├── templates
├── azure-pipelines.yml
├── release-pipeline.yml
├── smoke-test-pipeline.yml
├── patches
├── 001-azure-devops-node.patch
├── publishing
├── generateDoc.ts
├── locateAliases.ts
├── tools
├── release-version-bump.sh
├── tag-release.sh
├── update_introspection.sh
├── docs
├── commands
├── documents
├── contribution
├── contributing.md
├── designs
├── guides
├── src
├── lib
├── commands
├── logger
├── tests
├── typings
├── ssh-url
├── .editorconfig
├── .gitignore
├── jest.config.js
├── tsconfig.json
├── tslint.json
├── CHANGELOG.md
├── README.md
├── package.json
├── webpack.config.js
├── .yarn.lock
```

### Phase 2: Move SPK to Bedrock Repo

TODO

### Phase 3: Create a side by side new repo for Bedrock Infra/Cluster terraform

TODO