diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-10 14:21:58 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-05-10 14:21:58 +0100 |
| commit | cc8073653ea5f4bf54026b849f1e0b23a10de15a (patch) | |
| tree | 4dce464e49374b1c67f86f006415bbbc7ecbfa7d /.gitlab-ci.yml | |
| parent | a3074085cd01c0c062cb5f07e848375714dfd6d0 (diff) | |
| parent | 09c2aab4aa4661b147545e2c41b6a0100fc57b11 (diff) | |
| download | gitlab-ce-cc8073653ea5f4bf54026b849f1e0b23a10de15a.tar.gz | |
Merge branch 'master' into 30286-vue-loadin-icon30286-vue-loadin-icon
* master: (62 commits)
Fix broken test - load correct data
Remove redirect for old issue url containing id instead of iid
Use vue file for table pagination component
stub error handlers where uncaught Promise rejections currently exist
Revert "Fix OpenID spec failure that assumed current_sign_in_at would be set"
Add :redis keyword to some specs clear state of trackable attributes
Fix OpenID spec failure that assumed current_sign_in_at would be set
Kubernetes Helm Chart Install docs
Add Repository subnav to 'Find files'
Make tree, blob and blame pages more consistent
Add screenshots to Triggered Build docs
Add Prometheus memory sparkline to MR widget
Fix test failure in job vue componenFix test failure in job vue componentt
Remove unnecessary if check
Fix links in code review docs
Improve readability of code
Remove some unused Gitlab::Git code
Use Rails 'delegate'
Remove CI/CD models directory from `eager_load_paths`
Don't make Commit#raw_deltas private
...
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 588f255eff8..88d536fa9b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -141,6 +141,7 @@ stages: # Trigger a package build on omnibus-gitlab repository build-package: + before_script: [] services: [] variables: SETUP_DB: "false" @@ -148,17 +149,7 @@ build-package: stage: build when: manual script: - # If no branch in omnibus is specified, trigger pipeline against master - - if [ -z "$OMNIBUS_BRANCH" ] ; then export OMNIBUS_BRANCH=master ;fi - - echo "token=${BUILD_TRIGGER_TOKEN}" > version_details - - echo "ref=${OMNIBUS_BRANCH}" >> version_details - - echo "variables[ALTERNATIVE_SOURCES]=true" >> version_details - - echo "variables[GITLAB_VERSION]=${CI_COMMIT_SHA}" >> version_details - # Collect version details of all components - - for f in *_VERSION; do echo "variables[$f]=$(cat $f)" >> version_details; done - # Trigger the API and pass values collected above as parameters to it - - cat version_details | tr '\n' '&' | curl -X POST https://gitlab.com/api/v4/projects/20699/trigger/pipeline --data-binary @- - - rm version_details + - scripts/trigger-build # Prepare and merge knapsack tests knapsack: |