GitLab开发工作流程

GitLab开发工作流程

特效分支开发

1.基于master主干分支创建版本分支 （release-1.1.1）

2.基于master分支创建特性分支（feature-1，feature-2.。。。）

3.特性分支开发完成后，将特性分支合并到版本分支

4.基于版本 分支进行发布（DEV,UAT,STAG,PROD）；

5.版本分支合并到主干分支master；

6.基于master主干分支 创建一个标签tag；

GitLab开发工作流程

关闭gitlab默认的devops功能

设置--ci/cd

git config --global user.name "Administrator"
git config --global user.email "admin@example.com"

### 下载项目
# git clone http://192.168.1.200/devops/demo-hello-service.git
Cloning into 'demo-hello-service'...
Username for 'http://192.168.1.200': root
Password for 'http://root@192.168.1.200':
warning: You appear to have cloned an empty repository.

### 查看项目
# ls | grep demo
demo-hello-service
demo-java-service
microservicecicd-demo-service
spinnaker-canary-demo

### 进入项目中
#### 创建文件
# cd demo-hello-service/
# echo devopsdevops >> jenkins.txt
# ls
jenkins.txt


### 提交文件到远程仓库
# git add jenkins.txt
# git commit -m "add jenkins.txt "
[master (root-commit) d74d541] add jenkins.txt
 1 file changed, 1 insertion(+)
 create mode 100644 jenkins.txt
[root@zeyang-nuc-service demo-hello-service]# git push origin master
Username for 'http://192.168.1.200': root
Password for 'http://root@192.168.1.200':
Enumerating objects: 3, done.
Counting objects: 100% (3/3), done.
Writing objects: 100% (3/3), 221 bytes | 221.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To http://192.168.1.200/devops/demo-hello-service.git
 * [new branch]      master -> master

扩展：将本地已存在的代码提交到远程仓库

cd existing_folder
git init
git remote add origin http://192.168.1.200/devops/demo-hello-service.git
git add .
git commit -m "Initial commit"
git push -u origin master

[root@zeyang-nuc-service demo-hello-service]# git branch -a
* master
  remotes/origin/master

`git pull` 同步远程仓库所做的更新到本地， 这样远程的feature-1-DEV 分支就同步到了本地。然后我们使用 git checkout feature-1-DEV 切换到特性分支。

root@zeyang-nuc-service demo-hello-service]# git pull
Username for 'http://192.168.1.200': root
Password for 'http://root@192.168.1.200':
From http://192.168.1.200/devops/demo-hello-service
 * [new branch]      feature-1-DEV -> origin/feature-1-DEV
Already up to date.
[root@zeyang-nuc-service demo-hello-service]# git branch -a
* master
  remotes/origin/feature-1-DEV
  remotes/origin/master
[root@zeyang-nuc-service demo-hello-service]# git checkout feature-1-DEV
Branch 'feature-1-DEV' set up to track remote branch 'feature-1-DEV' from 'origin'.
Switched to a new branch 'feature-1-DEV'
[root@zeyang-nuc-service demo-hello-service]# git branch -a
* feature-1-DEV
  master
  remotes/origin/feature-1-DEV
  remotes/origin/master

### 更改文件内容
[root@zeyang-nuc-service demo-hello-service]# ls
jenkins.txt
[root@zeyang-nuc-service demo-hello-service]# vi jenkins.txt
[root@zeyang-nuc-service demo-hello-service]# cat jenkins.txt
pipeline {
   agent { label "master"}

   stages{
	stage("Build"){
		steps {
			script {
				echo "hello"
			}
		}
	}
  }
}
[root@zeyang-nuc-service demo-hello-service]# echo 1.1.1 >version
[root@zeyang-nuc-service demo-hello-service]# ls
jenkins.txt  version


### 提交到远程仓库分支
[root@zeyang-nuc-service demo-hello-service]# git add jenkins.txt version
[root@zeyang-nuc-service demo-hello-service]# git commit -m "add pipeline "
[feature-1-DEV 97ae23e] add pipeline
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 version
 
 [root@zeyang-nuc-service demo-hello-service]# git push origin feature-1-DEV
Username for 'http://192.168.1.200': root
Password for 'http://root@192.168.1.200':
Enumerating objects: 6, done.
Counting objects: 100% (6/6), done.
Delta compression using up to 8 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (4/4), 380 bytes | 380.00 KiB/s, done.
Total 4 (delta 0), reused 0 (delta 0)
remote:
remote: To create a merge request for feature-1-DEV, visit:
remote:   http://192.168.1.200/devops/demo-hello-service/-/merge_requests/new?merge_request%5Bsource_branch%5D=feature-1-DEV
remote:
To http://192.168.1.200/devops/demo-hello-service.git
   d74d541..97ae23e  feature-1-DEV -> feature-1-DEV

这样我们就把本地的特性分支开发的代码提交到了远程特性分支中了， 接下来对应该对该特性分支进行测试验证，没问题后合并到主干分支。

 给合并的版本分支打上一个tag