From 3143fe0cfe2a4cd17d3e3fa166c208e7dfa7c060 Mon Sep 17 00:00:00 2001
From: Victor Laza <vlaza@cloudbasesolutions.com>
Date: Wed, 15 Apr 2015 12:13:37 +0300
Subject: Configured artifacts publish daily & on merge for projects with
 documentation

JIRA: DOCS-2 - artifacts publish daily & on merge for the following projects:
opnfvdocs, octopus, genesis, functest, pharos

Change-Id: Id055d8e955e1c55c6b18a5bdf28d940ef7d53729
Signed-off-by: Victor Laza <vlaza@cloudbasesolutions.com>
---
 jjb/functest/functest.yml | 64 ++++++++---------------------------------------
 1 file changed, 10 insertions(+), 54 deletions(-)

(limited to 'jjb/functest')

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index be7f68940..b16d0715c 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -10,7 +10,6 @@
         - 'functest-daily-{stream}'
         - 'functest-merge'
         - 'functest-verify'
-        - 'functest-build-docs'
 
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
@@ -146,10 +145,11 @@
         - test-macro
 
     builders:
+        - shell:
+            !include-raw build-docu.sh
         - shell: |
-            pwd
-            find .
-            echo "Hello world from functest {somevar} daily"
+           gsutil cp docs/*.pdf gs://artifacts.opnfv.org/functest/docs/
+           gsutil cp docs/*.html gs://artifacts.opnfv.org/functest/docs/
 
     postbuilders:
         - test-macro
@@ -200,10 +200,8 @@
                     branch-pattern: '**/master'
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "verify logic goes here"
+        - shell:
+            !include-raw build-docu.sh
 
 - job-template:
     name: 'functest-merge'
@@ -214,52 +212,6 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
-    triggers:
-        - gerrit:
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'functest'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
-
-    builders:
-        - shell: |
-            pwd
-            find .
-            echo "merge logic goes here"
-
-- job-template:
-    name: 'functest-build-docs'
-
-    project-type: freestyle
-
     logrotate:
         daysToKeep: 30
         numToKeep: 40
@@ -298,4 +250,8 @@
     builders:
         - shell: 
             !include-raw build-docu.sh
+        - shell: |
+           gsutil cp docs/*.pdf gs://artifacts.opnfv.org/functest/docs/
+           gsutil cp docs/*.html gs://artifacts.opnfv.org/functest/docs/
+
 
-- 
cgit 1.2.3-korg