summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorm00133142 <meimei@huawei.com>2015-09-29 11:52:15 +0800
committerm00133142 <meimei@huawei.com>2015-09-29 14:43:26 +0800
commitc540cdcac422d2c97e66a4b205e418efe7cc481a (patch)
tree3ff9ecd8e2a456dd6b1814ea8e8518001195c9c9
parentdd2bc244d003ed5d17e1a865e6a9c3d97c2bed22 (diff)
add process of building PPA into daily job
- create a new job of making ppa - put making-ppa job in huawei's lab - change names of builders JIRA: COMPASS-80 Change-Id: Ie115d96e073c350161ac45d9bd33e74b9d6843ab Signed-off-by: m00133142 <meimei@huawei.com>
-rw-r--r--jjb/compass4nfv/compass4nfv.yml89
1 files changed, 62 insertions, 27 deletions
diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 30643f5..dc42952 100644
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -10,6 +10,7 @@
- 'compass-verify-on-ericsson-node'
- 'compass-merge'
- 'compass-daily-{stream}'
+ - 'compass-build-iso'
- 'compass-build'
- 'compass-deploy-virtual-{flavor}'
@@ -90,8 +91,8 @@
pattern: 'docs/**'
builders:
- - 'compass-build'
- - 'compass-workspace-cleanup'
+ - 'builder-compass-build-iso'
+ - 'builder-compass-workspace-cleanup'
- job-template:
name: 'compass-verify'
@@ -152,9 +153,9 @@
pattern: 'docs/**'
builders:
- - 'compass-build'
-# - 'compass-deploy-virtual-flavor'
-# - 'compass-backup-logs'
+ - 'builder-compass-build-iso'
+# - 'builder-compass-deploy-virtual-flavor'
+# - 'builder-compass-backup-logs'
# publishers:
# - archive:
# artifacts: 'ansible.log'
@@ -209,7 +210,7 @@
- branch-compare-type: 'ANT'
branch-pattern: '**/master'
builders:
- - 'compass-merge'
+ - 'builder-compass-merge'
- job-template:
name: 'compass-daily-{stream}'
@@ -240,9 +241,9 @@
artifactNumToKeep: -1
builders:
- #- 'compass-build'
- #- 'compass-upload-artifact'
- #- 'compass-workspace-cleanup'
+ #- 'builder-compass-build-iso'
+ #- 'builder-compass-upload-artifact'
+ #- 'builder-compass-workspace-cleanup'
- shell: |
echo "Hello world!"
echo "compass-deploy-virtual job will be triggered!"
@@ -256,7 +257,7 @@
threshold: SUCCESS
- job-template:
- name: 'compass-build'
+ name: 'compass-build-iso'
project-type: freestyle
@@ -281,10 +282,44 @@
branch: 'master'
builders:
- - 'compass-make-ppa'
- - 'compass-build'
- - 'compass-upload-artifact'
- - 'compass-workspace-cleanup'
+ - 'builder-compass-build-iso'
+ - 'builder-compass-upload-artifact'
+ - 'builder-compass-workspace-cleanup'
+
+- job-template:
+ name: 'compass-build'
+
+ description: "build ppa(using docker) in huawei lab"
+
+ project-type: freestyle
+
+ node: huawei-build
+
+ logrotate:
+ daysToKeep: 30
+ numToKeep: 10
+ artifactDaysToKeep: -1
+ artifactNumToKeep: -1
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ - compass-parameter:
+ installer: '{installer}'
+
+ scm:
+ - git-scm:
+ credentials-id: '{ssh-credentials}'
+
+ refspec: ''
+ branch: 'master'
+
+ builders:
+ - 'builder-compass-make-ppa'
+ - trigger-builds:
+ - project: 'compass-build-iso'
+ git-revision: true
+ block: true
- job-template:
name: 'compass-deploy-virtual-{flavor}'
@@ -315,10 +350,10 @@
artifactNumToKeep: -1
builders:
- - 'compass-ci-preclean-workspace'
- - 'compass-download-artifact'
- - 'compass-deploy-virtual-flavor'
- - 'compass-backup-logs'
+ - 'builder-compass-ci-preclean-workspace'
+ - 'builder-compass-download-artifact'
+ - 'builder-compass-deploy-virtual-flavor'
+ - 'builder-compass-backup-logs'
publishers:
- archive:
artifacts: 'ansible.log'
@@ -374,14 +409,14 @@
# builder macros
########################
- builder:
- name: compass-merge
+ name: 'builder-compass-merge'
builders:
- shell: |
#!/bin/bash
echo "Hello World!"
- builder:
- name: 'compass-make-ppa'
+ name: 'builder-compass-make-ppa'
builders:
- shell: |
#!/bin/bash
@@ -406,7 +441,7 @@
done
- builder:
- name: 'compass-build'
+ name: 'builder-compass-build-iso'
builders:
- shell: |
#!/bin/bash
@@ -452,7 +487,7 @@
echo "Done!"
- builder:
- name: 'compass-deploy-virtual-flavor'
+ name: 'builder-compass-deploy-virtual-flavor'
builders:
- shell: |
#!/bin/bash
@@ -475,7 +510,7 @@
echo "Done!"
- builder:
- name: 'compass-upload-artifact'
+ name: 'builder-compass-upload-artifact'
builders:
- shell: |
#!/bin/bash
@@ -503,7 +538,7 @@
echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso"
- builder:
- name: 'compass-download-artifact'
+ name: 'builder-compass-download-artifact'
builders:
- shell: |
#!/bin/bash
@@ -536,7 +571,7 @@
echo "Done!"
- builder:
- name: 'compass-workspace-cleanup'
+ name: 'builder-compass-workspace-cleanup'
builders:
- shell: |
#!/bin/bash
@@ -548,7 +583,7 @@
/bin/rm -rf $WORKSPACE
- builder:
- name: 'compass-ci-preclean-workspace'
+ name: 'builder-compass-ci-preclean-workspace'
builders:
- shell: |
#!/bin/bash
@@ -561,7 +596,7 @@
git clone $GIT_BASE $WORKSPACE
- builder:
- name: 'compass-backup-logs'
+ name: 'builder-compass-backup-logs'
builders:
- shell: |
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"