jjb: xci: xci-run-functest: Fix functest execution

[releng.git] / jjb / releng / opnfv-utils.yml

diff --git a/jjb/releng/opnfv-utils.yml b/jjb/releng/opnfv-utils.yml
index 43d8bb1..fb3bab4 100644 (file)
--- a/jjb/releng/opnfv-utils.yml
+++ b/jjb/releng/opnfv-utils.yml
@@ -8,6 +8,7 @@
       - 'archive-repositories'
       - 'check-status-of-slaves'
       - 'ansible-build-server'
+      - 'generate-artifacts-index-pages'
 
 ########################
 # job templates
@@ -24,7 +25,10 @@
           name: SLAVE_NAME
           description: Slaves to prune docker images
           default-slaves:
-            - arm-build2
+            - arm-build3
+            - arm-build4
+            - arm-build5
+            - arm-build6
             - ericsson-build3
             - ericsson-build4
             - lf-build2
@@ -85,7 +89,6 @@
     name: 'check-status-of-slaves'
 
     disabled: false
-
     concurrent: true
 
     parameters:
@@ -93,17 +96,23 @@
           name: SLAVE_NAME
           description: 'script lives on master node'
           default-slaves:
-            - master
+            - lf-build1
           allowed-multiselect: false
           ignore-offline-nodes: true
+      - project-parameter:
+          project: releng
+          branch: master
+
+    scm:
+      - git-scm
 
     triggers:
       - timed: '@midnight'
 
     builders:
       - shell: |
-          cd /opt/jenkins-ci/slavemonitor
-          bash slave-monitor-0.1.sh | sort
+          cd $WORKSPACE/utils/
+          bash slave-monitor-0.1.sh
 
 - job-template:
     name: 'ansible-build-server'
@@ -114,10 +123,12 @@
     concurrent: true
 
     parameters:
-      - label:
-          name: SLAVE_LABEL
-          description: 'Slave label on Jenkins'
-          default: 'test-ansible-build'
+      - node:
+          name: SLAVE_NAME
+          description: Build Servers
+          default-slaves:
+            - lf-build1
+            - lf-build2
           allowed-multiselect: true
           ignore-offline-nodes: true
       - project-parameter:
@@ -143,12 +154,12 @@
           if [ -f /etc/centos-release ] \
           || [ -f /etc/redhat-release ] \
           || [ -f /etc/system-release ]; then
-          sudo yum install ansible
+          sudo yum -y install ansible
           fi
           if [ -f /etc/debian_version ] \
           || grep -qi ubuntu /etc/lsb-release \
           || grep -qi ubuntu /etc/os-release; then
-          sudo apt-get install ansible
+          sudo apt-get -y install ansible
           fi
 
 - builder:
@@ -156,6 +167,43 @@
     builders:
       - shell: |
           # run playbook
-          sudo ansible-playbook -C -D -i \
+          sudo ansible-playbook -i \
           $WORKSPACE/utils/build-server-ansible/inventory.ini \
           $WORKSPACE/utils/build-server-ansible/main.yml
+
+
+- job-template:
+    name: 'generate-artifacts-index-pages'
+
+    project-type: freestyle
+
+    disabled: false
+
+    concurrent: false
+
+    parameters:
+      - node:
+          name: SLAVE_NAME
+          description: Build Servers
+          default-slaves:
+            - lf-build2
+      - project-parameter:
+          project: releng
+          branch: master
+
+    scm:
+      - git-scm
+
+    triggers:
+      - timed: '@hourly'
+
+    builders:
+      - generate-artifact-html
+
+
+- builder:
+    name: generate-artifact-html
+    builders:
+      - shell: |
+          cd $WORKSPACE/utils/
+          ./artifacts.opnfv.org.sh