bugfix: a wrong statement of calculating md5

[releng.git] / jjb / compass4nfv / compass4nfv.yml

diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 64936a5..032cd9b 100644 (file)
--- 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,8 +153,14 @@
                     pattern: 'docs/**'
 
     builders:
-        - 'compass-build'
-        #- 'compass-deploy-virtual-flavor'
+        - 'builder-compass-build-iso'
+#        - 'builder-compass-deploy-virtual-flavor'
+#        - 'builder-compass-backup-logs'
+#    publishers:
+#        - archive:
+#            artifacts: 'ansible.log'
+#            allow-empty: 'true'
+#            fingerprint: true
 
 - job-template:
     name: 'compass-merge'
@@ -203,7 +210,7 @@
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/master'
     builders:
-        - 'compass-merge'
+        - 'builder-compass-merge'
 
 - job-template:
     name: 'compass-daily-{stream}'
@@ -234,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!"
@@ -250,7 +257,7 @@
             threshold: SUCCESS
 
 - job-template:
-    name: 'compass-build'
+    name: 'compass-build-iso'
 
     project-type: freestyle
 
@@ -275,9 +282,44 @@
             branch: 'master'
 
     builders:
-        - '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}'
@@ -308,9 +350,15 @@
         artifactNumToKeep: -1
 
     builders:
-        - 'compass-ci-preclean-workspace'
-        - 'compass-download-artifact'
-        - 'compass-deploy-virtual-flavor'
+        - 'builder-compass-ci-preclean-workspace'
+        - 'builder-compass-download-artifact'
+        - 'builder-compass-deploy-virtual-flavor'
+        - 'builder-compass-backup-logs'
+    publishers:
+        - archive:
+            artifacts: 'ansible.log'
+            allow-empty: 'true'
+            fingerprint: true
 
 ########################
 # parameter macros
@@ -347,21 +395,53 @@
             default: "root@192.168.127.11:~/xh/work/build/work"
             description: "Artifact Repository"
 
+        - string:
+            name: installer_ip
+            default: "10.1.0.12"
+        - string:
+            name: PPA_REPO
+            default: "http://58.251.166.184:9999"
+        - string:
+            name: PPA_CACHE
+            default: "$WORKSPACE/work/repo/"
 
 ########################
 # builder macros
 ########################
 - builder:
-    name: compass-merge
+    name: 'builder-compass-merge'
     builders:
         - shell: |
             #!/bin/bash
             echo "Hello World!"
 
-
+- builder:
+    name: 'builder-compass-make-ppa'
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -x
+            set -o errexit
+            set -o nounset
+            set -o pipefail
+            # make ppa
+            cd $WORKSPACE/
+            ./build/make_repo.sh
+            # calc MD5 of ppa
+            cd $PPA_CACHE
+            for i in `find *.gz *.iso *.img -type f`
+            do
+                md5=`md5sum $i | cut -d ' ' -f1`
+                echo $md5 > $i.md5
+            done
+            # upload PPA
+            for i in `find *.* -type f`
+            do
+                curl -T $i $PPA_REPO
+            done
 
 - builder:
-    name: 'compass-build'
+    name: 'builder-compass-build-iso'
     builders:
         - shell: |
             #!/bin/bash
@@ -382,6 +462,11 @@
             export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S")
 
             # start the build
+            if [ -d $PPA_CACHE ]
+            then
+                cp $PPA_CACHE/*.tar.gz $PPA_CACHE/*.iso $PPA_CACHE/*.img $CACHE_DIRECTORY/ -f
+            fi
+
             cd $WORKSPACE/
             ./build.sh  --iso-dir $BUILD_DIRECTORY/ --iso-name compass.iso -c $CACHE_DIRECTORY
 
@@ -402,13 +487,14 @@
             echo "Done!"
 
 - builder:
-    name: 'compass-deploy-virtual-flavor'
+    name: 'builder-compass-deploy-virtual-flavor'
     builders:
         - shell: |
             #!/bin/bash
             set -o errexit
             set -o nounset
             set -o pipefail
+            set -x
 
             # log info to console
             echo "Starting the deployment on virtual environment using $INSTALLER. This could take some time..."
@@ -424,7 +510,7 @@
             echo "Done!"
 
 - builder:
-    name: 'compass-upload-artifact'
+    name: 'builder-compass-upload-artifact'
     builders:
         - shell: |
             #!/bin/bash
@@ -452,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
@@ -475,17 +561,17 @@
             source latest.properties
 
             # download the file
-            curl -s -o $WORKSPACE/opnfv.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2>&1
+            curl -s -o $WORKSPACE/compass.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2>&1
 
             # list the file
-            ls -al $WORKSPACE/opnfv.iso
+            ls -al $WORKSPACE/compass.iso
 
             echo
             echo "--------------------------------------------------------"
             echo "Done!"
 
 - builder:
-    name: 'compass-workspace-cleanup'
+    name: 'builder-compass-workspace-cleanup'
     builders:
         - shell: |
             #!/bin/bash
@@ -497,7 +583,7 @@
             /bin/rm -rf $WORKSPACE
 
 - builder:
-    name: 'compass-ci-preclean-workspace'
+    name: 'builder-compass-ci-preclean-workspace'
     builders:
         - shell: |
             #!/bin/bash
@@ -509,3 +595,9 @@
             sudo rm $WORKSPACE -rf
             git clone $GIT_BASE  $WORKSPACE
 
+- builder:
+    name: 'builder-compass-backup-logs'
+    builders:
+        - shell: |
+            ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+            sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_juno-opnfv2/ansible.log ./  &> /dev/null