Merge branch '3.1.x' into 3.2.x
This commit is contained in:
commit
f2362d3f8c
|
@ -478,6 +478,8 @@ jobs:
|
||||||
save_build_info: true
|
save_build_info: true
|
||||||
- task: promote
|
- task: promote
|
||||||
file: git-repo/ci/tasks/promote.yml
|
file: git-repo/ci/tasks/promote.yml
|
||||||
|
vars:
|
||||||
|
dockerhub-proxy-cache: ((dockerhub-proxy-cache))
|
||||||
params:
|
params:
|
||||||
RELEASE_TYPE: M
|
RELEASE_TYPE: M
|
||||||
<<: *artifactory-task-params
|
<<: *artifactory-task-params
|
||||||
|
@ -514,6 +516,8 @@ jobs:
|
||||||
<<: *artifactory-task-params
|
<<: *artifactory-task-params
|
||||||
- task: generate-changelog
|
- task: generate-changelog
|
||||||
file: git-repo/ci/tasks/generate-changelog.yml
|
file: git-repo/ci/tasks/generate-changelog.yml
|
||||||
|
vars:
|
||||||
|
dockerhub-proxy-cache: ((dockerhub-proxy-cache))
|
||||||
params:
|
params:
|
||||||
RELEASE_TYPE: RC
|
RELEASE_TYPE: RC
|
||||||
GITHUB_USERNAME: ((github-username))
|
GITHUB_USERNAME: ((github-username))
|
||||||
|
@ -537,6 +541,8 @@ jobs:
|
||||||
threads: 8
|
threads: 8
|
||||||
- task: promote
|
- task: promote
|
||||||
file: git-repo/ci/tasks/promote.yml
|
file: git-repo/ci/tasks/promote.yml
|
||||||
|
vars:
|
||||||
|
dockerhub-proxy-cache: ((dockerhub-proxy-cache))
|
||||||
params:
|
params:
|
||||||
RELEASE_TYPE: RELEASE
|
RELEASE_TYPE: RELEASE
|
||||||
<<: *artifactory-task-params
|
<<: *artifactory-task-params
|
||||||
|
@ -571,6 +577,8 @@ jobs:
|
||||||
save_build_info: true
|
save_build_info: true
|
||||||
- task: generate-changelog
|
- task: generate-changelog
|
||||||
file: git-repo/ci/tasks/generate-changelog.yml
|
file: git-repo/ci/tasks/generate-changelog.yml
|
||||||
|
vars:
|
||||||
|
dockerhub-proxy-cache: ((dockerhub-proxy-cache))
|
||||||
params:
|
params:
|
||||||
RELEASE_TYPE: RELEASE
|
RELEASE_TYPE: RELEASE
|
||||||
GITHUB_USERNAME: ((github-username))
|
GITHUB_USERNAME: ((github-username))
|
||||||
|
|
Loading…
Reference in New Issue