Etesting

Branches of test-definitions repository

发表于 | 分类于 |

本文主要讲述Estuary测试用例仓库test-definitions的分支用途以及日常维护操作。

克隆仓库

test-definitions 当前仓库地址为: https://github.com/jarsonfang/test-definitions.git。（后面将迁移至open-estuary组织下面）

1
2
3
4
5
$ git clone https://github.com/jarsonfang/test-definitions.git
$ cd test-definitions/
$ git remote -v
origin  https://github.com/jarsonfang/test-definitions.git (fetch)
origin  https://github.com/jarsonfang/test-definitions.git (push)

仓库分支

1
2
3
4
5
6
7
8
9
10
11
$ git status
On branch estuary-dev
Your branch is up-to-date with 'origin/estuary-dev'.
nothing to commit, working directory clean
$ git branch -a
* estuary-dev
  remotes/origin/HEAD -> origin/estuary-dev
  remotes/origin/chase.qi
  remotes/origin/estuary
  remotes/origin/estuary-dev
  remotes/origin/master

默认的远程仓库为origin，默认的仓库分支为estuary-dev(关联远程分支origin/estuary-dev)。
此外，origin仓库中还有以下三个分支，具体用途说明如下：
origin/master分支与Linaro QA官方test-definitions仓库的主分支保持同步一致。
origin/chase.qi分支与Linaro QA官方test-definitions仓库的主要维护者之一 Chase Qi 的个人仓库的主分支保持同步一致。
origin/estuary分支为基于orgin/master，用于整合Linaro QA与Estuary QA团队测试用例资源的主分支（稳定分支）。
origin/estuary-dev分支为基于origin/estuary的开发分支，用于接收Estuary QA团队测试用例开发的提交，新的测试用例开发完成之后，将合入origin/estuary分支。

创建本地分支

estuary-dev为本地分支，并关联了origin/estuary-dev远程仓库分支。
为方便仓库后续维护，创建关联远程origin仓库其他分支的本地分支：

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
$ git checkout -b chase.qi origin/chase.qi
Branch chase.qi set up to track remote branch chase.qi from origin.
Switched to a new branch 'chase.qi'
$ git checkout -b estuary origin/estuary
Branch estuary set up to track remote branch estuary from origin.
Switched to a new branch 'estuary'
$ git checkout -b master origin/master
Branch master set up to track remote branch master from origin.
Switched to a new branch 'master'
$ git branch -a
  chase.qi
  estuary
  estuary-dev
* master
  remotes/origin/HEAD -> origin/estuary-dev
  remotes/origin/chase.qi
  remotes/origin/estuary
  remotes/origin/estuary-dev
  remotes/origin/master

日常维护操作

同步Linaro QA官方仓库

添加远程仓库

首次操作时需添加Linaro QA官方远程仓库，后续维护忽略此步骤：

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
$ git remote add upstream https://git.linaro.org/qa/test-definitions.git
$ git remote -v
origin  https://github.com/jarsonfang/test-definitions.git (fetch)
origin  https://github.com/jarsonfang/test-definitions.git (push)
upstream        https://git.linaro.org/qa/test-definitions.git (fetch)
upstream        https://git.linaro.org/qa/test-definitions.git (push)
$ git branch -a
  chase.qi
  estuary
  estuary-dev
* master
  remotes/origin/HEAD -> origin/estuary-dev
  remotes/origin/chase.qi
  remotes/origin/estuary
  remotes/origin/estuary-dev
  remotes/origin/master

上述命令操作添加了Linaro QA官方的test-definitions仓库为远程仓库upstream，此时查看仓库分支，还没有变化。

同步远程仓库

以远程仓库upstream为例，使用git fetch命令同步远程仓库内容：

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
$ git fetch upstream
remote: Counting objects: 22, done.
remote: Compressing objects: 100% (22/22), done.
remote: Total 22 (delta 0), reused 22 (delta 0)
Unpacking objects: 100% (22/22), done.
From https://git.linaro.org/qa/test-definitions
 * [new branch]      master     -> upstream/master
 * [new tag]         2013.10    -> 2013.10
 * [new tag]         2013.12    -> 2013.12
 * [new tag]         2014.01    -> 2014.01
 * [new tag]         2014.02    -> 2014.02
 * [new tag]         2014.04    -> 2014.04
 * [new tag]         2014.05    -> 2014.05
 * [new tag]         2014.06    -> 2014.06
 * [new tag]         2014.07    -> 2014.07
 * [new tag]         2014.08    -> 2014.08
 * [new tag]         2014.09    -> 2014.09
 * [new tag]         2014.10    -> 2014.10
 * [new tag]         2014.11    -> 2014.11
 * [new tag]         2014.12    -> 2014.12
 * [new tag]         2015.01    -> 2015.01
 * [new tag]         2015.03    -> 2015.03
 * [new tag]         2015.04    -> 2015.04
 * [new tag]         2015.05    -> 2015.05
 * [new tag]         2015.06    -> 2015.06
 * [new tag]         2015.07    -> 2015.07
 * [new tag]         2015.08    -> 2015.08
 * [new tag]         2015.09    -> 2015.09
 * [new tag]         2015.11    -> 2015.11
 * [new tag]         2016.01    -> 2016.01
 * [new tag]         2016.03    -> 2016.03
 * [new tag]         rpb-16.12  -> rpb-16.12
$ git branch -a
  chase.qi
  estuary
  estuary-dev
* master
  remotes/origin/HEAD -> origin/estuary-dev
  remotes/origin/chase.qi
  remotes/origin/estuary
  remotes/origin/estuary-dev
  remotes/origin/master
  remotes/upstream/master

git fetch命令执行完成之后，远程仓库upstream的主分支内容已同步到upstream/master分支。

合并更新到master分支

确认当前分支为master分支:

1
2
3
4
5
6
7
8
$ git checkout master
Already on 'master'
Your branch is up-to-date with 'origin/master'.
$ git branch
  chase.qi
  estuary
  estuary-dev
* master

使用git merge命令合并upstream/master分支内容到master分支，然后推送到origin/master分支。

1
2
3
4
5
6
$ git merge upstream/master
Already up-to-date.
$ git push
Username for 'https://github.com': jarsonfang
Password for 'https://jarsonfang@github.com':
Everything up-to-date

同步chase.qi仓库

添加远程仓库

首次操作时需添加chase.qi远程仓库，后续维护忽略此步骤：

1
2
3
4
5
6
7
8
$ git remote add chase.qi https://git.linaro.org/people/chase.qi/test-definitions.git
$ git remote -v
chase.qi        https://git.linaro.org/people/chase.qi/test-definitions.git (fetch)
chase.qi        https://git.linaro.org/people/chase.qi/test-definitions.git (push)
origin  https://github.com/jarsonfang/test-definitions.git (fetch)
origin  https://github.com/jarsonfang/test-definitions.git (push)
upstream        https://git.linaro.org/qa/test-definitions.git (fetch)
upstream        https://git.linaro.org/qa/test-definitions.git (push)

同步远程仓库

使用git fetch命令同步远程仓库内容：

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
$ git fetch chase.qi
remote: Counting objects: 34, done.
remote: Compressing objects: 100% (34/34), done.
remote: Total 34 (delta 21), reused 0 (delta 0)
Unpacking objects: 100% (34/34), done.
From https://git.linaro.org/people/chase.qi/test-definitions
 * [new branch]      master     -> chase.qi/master
$ git branch -a
  chase.qi
  estuary
  estuary-dev
* master
  remotes/chase.qi/master
  remotes/origin/HEAD -> origin/estuary-dev
  remotes/origin/chase.qi
  remotes/origin/estuary
  remotes/origin/estuary-dev
  remotes/origin/master
  remotes/upstream/master

git fetch命令执行完成之后，远程仓库chase.qi的主分支内容已同步到chase.qi/master分支。

合并更新到chase.qi分支

确认当前分支为chase.qi分支：

1
2
3
4
5
6
7
8
$ git checkout chase.qi
Switched to branch 'chase.qi'
Your branch is up-to-date with 'origin/chase.qi'.
$ git branch
* chase.qi
  estuary
  estuary-dev
  master

使用git merge命令合并chase.qi/master分支内容到chase.qi分支，然后推送到origin/chase.qi分支。

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
$ git merge chase.qi/master
Merge made by the 'recursive' strategy.
 automated/android/cts/cts-local.yaml   |  29 +++++++
 automated/android/cts/cts-runner.py    | 227 +++++++++++++++++++++--------------------------------
 automated/android/cts/cts.sh           |  50 ++++++++----
 automated/android/cts/cts.yaml         |  27 +++++++
 automated/lib/android-test-lib         |   3 +-
 automated/lib/py_test_lib.py           |   8 +-
 automated/linux/pi-stress/pi-stress.py |   1 -
 7 files changed, 187 insertions(+), 158 deletions(-)
 create mode 100644 automated/android/cts/cts-local.yaml
 mode change 100644 => 100755 automated/android/cts/cts.sh
 create mode 100644 automated/android/cts/cts.yaml
$ git push
Username for 'https://github.com': jarsonfang
Password for 'https://jarsonfang@github.com':
Counting objects: 36, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (36/36), done.
Writing objects: 100% (36/36), 6.40 KiB | 0 bytes/s, done.
Total 36 (delta 22), reused 0 (delta 0)
remote: Resolving deltas: 100% (22/22), completed with 7 local objects.
To https://github.com/jarsonfang/test-definitions.git
   fc3a5bf..0cb6c71  chase.qi -> chase.qi

更新estuary分支

estuary分支主要用于合并master分支与estuary-dev分支的更新。

确认当前分支为estuary分支：

1
2
3
4
5
6
7
8
$ git checkout estuary
Switched to branch 'estuary'
Your branch is up-to-date with 'origin/estuary'.
$ git branch
  chase.qi
* estuary
  estuary-dev
  master

使用git merge命令合并master与estuary-dev分支的内容，然后推送到origin/estuary分支。

1
2
3
4
5
6
7
8
$ git merge master
Already up-to-date.
$ git merge estuary-dev
Already up-to-date.
$ git push
Username for 'https://github.com': jarsonfang
Password for 'https://jarsonfang@github.com':
Everything up-to-date

更新estuary-dev分支

estuary-dev为基于estuary的开发分支，主要用于接收Estuary QA团队测试用例开发的提交，并与estuary分支内容保持同步。

确认当前分支为estuary-dev分支：

1
2
3
4
5
6
7
8
$ git checkout estuary-dev
Switched to branch 'estuary-dev'
Your branch is up-to-date with 'origin/estuary-dev'.
$ git branch
  chase.qi
  estuary
* estuary-dev
  master

使用git merge命令合并estuary分支内容，然后推送到origin/estuary-dev分支。

1
2
3
4
5
6
$ git merge estuary
Already up-to-date.
$ git push
Username for 'https://github.com': jarsonfang
Password for 'https://jarsonfang@github.com':
Everything up-to-date

热评文章