diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2015-03-17 21:43:19 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2015-03-17 21:44:23 +0100 |
| commit | e0a4b2c7a7bf1d5fc0731a211d4441774b46c6aa (patch) | |
| tree | d6b444b96f4edb684f7588868320865b9f8f4e4f | |
| parent | a7b2e67efc992556769128d2be36db5175057e30 (diff) | |
Remove genesis-daily and use Fuel build script
Remove duplicated genesis-daily job.
Start using Fuel build script in genesis-build job.
JIRA: OCTO-16
Change-Id: I74395898bc8692f3a00f72097b5e3f43e3000b58
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
| -rw-r--r-- | jjb/genesis/genesis.yml | 72 |
1 files changed, 7 insertions, 65 deletions
diff --git a/jjb/genesis/genesis.yml b/jjb/genesis/genesis.yml index fb2fe7b0e..8417b784f 100644 --- a/jjb/genesis/genesis.yml +++ b/jjb/genesis/genesis.yml @@ -1,7 +1,6 @@ - project: name: genesis jobs: - - 'genesis-daily-master' - 'genesis-merge' - 'genesis-verify' - 'genesis-foreman-daily-master' @@ -20,58 +19,6 @@ project: 'genesis' - job-template: - name: 'genesis-daily-master' - - # Job template for daily builders - # - # Required Variables: - # stream: branch with - in place of / (eg. stable) - # branch: branch (eg. stable) - - project-type: freestyle - node: fuel - - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - - parameters: - - project-parameter: - project: '{project}' - - scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' - - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - - triggers: - - timed: 'H H * * *' - - builders: - - shell: | - hostname - whoami - docker --version - cd fuel-build/docker - pwd - echo foo - make clean || true - make - cd .. - echo foo - make clean || true - make all - if [[ -d /var/www/genesis-fuel/daily ]]; then sudo rm /var/www/genesis-fuel/daily; fi - sudo ln -s /home/jenkins-ci/workspace/genesis-daily-master/fuel-build/release/ /var/www/genesis-fuel/daily - -- job-template: name: 'genesis-verify' project-type: freestyle @@ -388,6 +335,10 @@ name: GERRIT_REFSPEC default: refs/heads/master description: "Refspec to retrieve." + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "The directory where the artifact will be placed upon completion of the build." scm: - git: @@ -405,18 +356,9 @@ set -o nounset set -o pipefail - hostname - whoami - docker --version - cd $WORKSPACE/fuel-build/docker - pwd - echo foo - make clean || true - make - cd .. - echo foo - make clean || true - make all + cd $WORKSPACE/fuel/ci + ./build.sh $BUILD_DIRECTORY + ls -al $BUILD_DIRECTORY - job-template: name: genesis-deploy |