Merge "armband: adding pod2, and disabling jobs for pod1"
authorRyota Mibu <r-mibu@cq.jp.nec.com>
Fri, 8 Jul 2016 14:00:17 +0000 (14:00 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 8 Jul 2016 14:00:17 +0000 (14:00 +0000)
30 files changed:
jjb/apex/apex-upload-artifact.sh
jjb/armband/armband-download-artifact.sh
jjb/armband/armband-project-jobs.yml
jjb/armband/upload-artifacts.sh
jjb/bottlenecks/bottlenecks-project-jobs.yml
jjb/compass4nfv/compass-deploy.sh
jjb/compass4nfv/compass-project-jobs.yml
jjb/fuel/fuel-project-jobs.yml
jjb/functest/functest-ci-jobs.yml
jjb/kvmfornfv/kvmfornfv.yml
jjb/opnfv/opnfv-docker.yml
jjb/opnfv/slave-params.yml
jjb/releng-macros.yaml
jjb/sandbox/basic.sh [new file with mode: 0755]
jjb/sandbox/build.sh [new file with mode: 0755]
jjb/sandbox/deploy.sh [new file with mode: 0755]
jjb/sandbox/functest.sh [new file with mode: 0755]
jjb/sandbox/merge.sh [new file with mode: 0755]
jjb/sandbox/promote.sh [new file with mode: 0755]
jjb/sandbox/sandbox-daily-jobs.yml [new file with mode: 0644]
jjb/sandbox/sandbox-merge-jobs.yml [new file with mode: 0644]
jjb/sandbox/sandbox-verify-jobs.yml
jjb/sandbox/sandbox-weekly-jobs.yml [new file with mode: 0644]
jjb/sandbox/test.sh [new file with mode: 0755]
jjb/sandbox/verify.sh [new file with mode: 0755]
jjb/sandbox/yardstick.sh [new file with mode: 0755]
jjb/yardstick/yardstick-ci-jobs.yml
jjb/yardstick/yardstick-project-jobs.yml
utils/jenkins-jnlp-connect.sh
utils/retention_script.sh [changed mode: 0644->0755]

index d45c7c0..0dd112b 100755 (executable)
@@ -35,7 +35,7 @@ done
 signiso () {
 time gpg2 -vvv --batch --yes --no-tty \
   --default-key opnfv-helpdesk@rt.linuxfoundation.org  \
-  --passphrase notreallysecure \
+  --passphrase besteffort \
   --detach-sig $BUILD_DIRECTORY/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso
 
 gsutil cp $BUILD_DIRECTORY/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso.sig gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso.sig 
index 18b55d7..7d01c09 100755 (executable)
@@ -10,6 +10,9 @@
 set -o errexit
 set -o pipefail
 
+# Configurable environment variables:
+# ISOSTORE (/iso_mount/opnfv_ci)
+
 if [[ "$JOB_NAME" =~ "merge" ]]; then
     echo "Downloading http://$GS_URL/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties"
     # get the properties file for the Armband Fuel ISO built for a merged change
@@ -33,7 +36,7 @@ ISO_FILE=${WORKSPACE}/opnfv.iso
 # using ISOs for verify & merge jobs from local storage will be enabled later
 if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then
     # check if we already have the ISO to avoid redownload
-    ISOSTORE="/iso_mount/opnfv_ci/${GIT_BRANCH##*/}"
+    ISOSTORE=${ISOSTORE:-/iso_mount/opnfv_ci}/${GIT_BRANCH##*/}
     if [[ -f "$ISOSTORE/$OPNFV_ARTIFACT" ]]; then
         echo "ISO exists locally. Skipping the download and using the file from ISO store"
         ln -s $ISOSTORE/$OPNFV_ARTIFACT ${ISO_FILE}
index 732a9ea..764a5d4 100644 (file)
@@ -76,7 +76,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - 'arm-build1-defaults'
+        - 'opnfv-build-arm-defaults'
         - armband-project-parameter:
             gs-pathname: '{gs-pathname}'
 
index f4e84e9..7059ac3 100755 (executable)
@@ -9,6 +9,9 @@
 ##############################################################################
 set -o pipefail
 
+# configurable environment variables:
+# ISOSTORE (/iso_mount/opnfv_ci)
+
 # check if we built something
 if [ -f $WORKSPACE/.noupload ]; then
     echo "Nothing new to upload. Exiting."
@@ -19,11 +22,15 @@ fi
 # source the opnfv.properties to get ARTIFACT_VERSION
 source $WORKSPACE/opnfv.properties
 
+
 # storing ISOs for verify & merge jobs will be done once we get the disk array
 if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then
     # store ISO locally on NFS first
-    ISOSTORE="/home/jenkins/opnfv/iso_store"
+    ISOSTORE=${ISOSTORE:-/iso_mount/opnfv_ci}
     if [[ -d "$ISOSTORE" ]]; then
+        ISOSTORE=${ISOSTORE}/${GIT_BRANCH##*/}
+        mkdir -p $ISOSTORE
+
         # remove all but most recent 3 ISOs first to keep iso_mount clean & tidy
         cd $ISOSTORE
         ls -tp | grep -v '/' | tail -n +4 | xargs -d '\n' /bin/rm -f --
index ea000d8..28b49bc 100644 (file)
     parameters:
         - project-parameter:
             project: '{project}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - bottlenecks-parameter:
             gs-packagepath: '{gs-packagepath}'
 
index 7d09d53..68a93a1 100644 (file)
@@ -27,6 +27,8 @@ export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
 
 if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]; then
     export NETWORK_CONF_FILE=network_ocl.yml
+elif [[ "${DEPLOY_SCENARIO}" =~ "-onos" ]]; then
+    export NETWORK_CONF_FILE=network_onos.yml
 else
     export NETWORK_CONF_FILE=network.yml
 fi
index da28687..6e10e2f 100644 (file)
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - '{installer}-defaults'
 
     scm:
index 67343fb..9fc7ab2 100644 (file)
@@ -43,7 +43,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - '{installer}-defaults'
         - choice:
             name: FORCE_BUILD
@@ -92,7 +92,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - '{installer}-defaults'
         - fuel-project-parameter:
             gs-pathname: '{gs-pathname}'
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - '{installer}-defaults'
         - fuel-project-parameter:
             gs-pathname: '{gs-pathname}'
index f9cf011..727419d 100644 (file)
             slave-label: fuel-virtual
             installer: fuel
             <<: *brahmaputra
-
-# just in case if things go wrong
-        - lf-pod2:
-            slave-label: fuel-baremetal
-            installer: fuel
-            <<: *master
-
 # joid CI PODs
         - baremetal:
             slave-label: joid-baremetal
index b042c56..aa8b645 100644 (file)
@@ -23,7 +23,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -62,7 +62,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
 
     scm:
         - gerrit-trigger-scm:
index 6b49242..6b4861c 100644 (file)
@@ -34,7 +34,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - string:
             name: PUSH_IMAGE
             default: "true"
@@ -77,7 +77,7 @@
     parameters:
         - project-parameter:
             project: 'yardstick'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - string:
             name: PUSH_IMAGE
             default: "true"
index e5313c8..b7ecfde 100644 (file)
@@ -1,13 +1,14 @@
+#####################################################
+# Parameters for slaves using old labels
+# This will be cleaned up once the new job structure and
+# use of the new labels are in place
+#####################################################
 - parameter:
     name: 'apex-daily-master-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
             default: 'apex-daily-master'
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             name: SLAVE_LABEL
             default: 'apex-verify-master'
         - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: SSH_KEY
+            default: /root/.ssh/id_rsa
+            description: 'SSH key to use for Apex'
+- parameter:
+    name: 'lf-pod1-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - lf-pod1
+            default-slaves:
+                - lf-pod1
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
+#####################################################
+# Parameters for CI baremetal PODs
+#####################################################
 - parameter:
-    name: 'fuel-baremetal-defaults'
+    name: 'apex-baremetal-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'fuel-baremetal'
+            default: 'apex-baremetal'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: SSH_KEY
+            default: /root/.ssh/id_rsa
+            description: 'SSH key to use for Apex'
 - parameter:
-    name: 'fuel-virtual-defaults'
+    name: 'compass-baremetal-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'fuel-virtual'
+            default: 'compass-baremetal'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+    name: 'fuel-baremetal-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'fuel-baremetal'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             name: EXTERNAL_NETWORK
             default: ext-net;flat;10.5.15.5;10.5.15.250;10.5.15.254;10.5.15.0/24
             description: "External network to create for pod5 (name;type;first ip;last ip; gateway;network)"
+#####################################################
+# Parameters for CI virtual PODs
+#####################################################
 - parameter:
-    name: 'joid-virtual-defaults'
+    name: 'apex-virtual-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'joid-virtual'
+            default: 'apex-virtual'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-- parameter:
-    name: 'compass-baremetal-defaults'
-    parameters:
-        - label:
-            name: SLAVE_LABEL
-            default: 'compass-baremetal'
         - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on this Jenkins Slave'
+            name: SSH_KEY
+            default: /root/.ssh/id_rsa
+            description: 'SSH key to use for Apex'
 - parameter:
     name: 'compass-virtual-defaults'
     parameters:
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 - parameter:
-    name: 'lf-pod1-defaults'
+    name: 'fuel-virtual-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - lf-pod1
-            default-slaves:
-                - lf-pod1
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
+        - label:
+            name: SLAVE_LABEL
+            default: 'fuel-virtual'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: SSH_KEY
-            default: /root/.ssh/id_rsa
-            description: 'SSH key to use for Apex'
-- parameter:
-    name: 'lf-pod2-defaults'
-    parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - lf-pod2
-            default-slaves:
-                - lf-pod2
-        - string:
-            name: GIT_BASE
-            default: ssh://gerrit.opnfv.org:29418/$PROJECT
-            description: 'Git URL to use on this Jenkins Slave'
 - parameter:
-    name: 'ericsson-pod1-defaults'
+    name: 'joid-virtual-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - ericsson-pod1
-            default-slaves:
-                - ericsson-pod1
+        - label:
+            name: SLAVE_LABEL
+            default: 'joid-virtual'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+#####################################################
+# Parameters for build slaves
+#####################################################
 - parameter:
-    name: 'ericsson-pod2-defaults'
+    name: 'opnfv-build-arm-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - ericsson-pod2
-            default-slaves:
-                - ericsson-pod2
+        - label:
+            name: SLAVE_LABEL
+            default: 'opnfv-build-arm'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
+        - string:
+            name: BUILD_DIRECTORY
+            default: $WORKSPACE/build_output
+            description: "Directory where the build artifact will be located upon the completion of the build."
 - parameter:
-    name: 'intel-pod2-defaults'
+    name: 'opnfv-build-centos-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - intel-pod2
-            default-slaves:
-                - intel-pod2
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
+        - label:
+            name: SLAVE_LABEL
+            default: 'opnfv-build-centos'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
         - string:
-            name: SSH_KEY
-            default: /root/.ssh/id_rsa
-            description: 'SSH key to use for Apex'
-
+            name: BUILD_DIRECTORY
+            default: $WORKSPACE/build_output
+            description: "Directory where the build artifact will be located upon the completion of the build."
 - parameter:
-    name: 'intel-pod3-defaults'
+    name: 'opnfv-build-ubuntu-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - intel-pod3
-            default-slaves:
-                - intel-pod3
+        - label:
+            name: SLAVE_LABEL
+            default: 'opnfv-build-ubuntu'
+            description: 'Slave label on Jenkins'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
+        - string:
+            name: BUILD_DIRECTORY
+            default: $WORKSPACE/build_output
+            description: "Directory where the build artifact will be located upon the completion of the build."
 - parameter:
-    name: 'intel-pod5-defaults'
+    name: 'huawei-build-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-pod5
+                - huawei-build
             default-slaves:
-                - intel-pod5
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
+                - huawei-build
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: CEPH_DISKS
-            default: /srv
-            description: "Disks to use by ceph (comma separated list)"
-        - string:
-            name: EXTERNAL_NETWORK
-            default: ext-net;flat;10.5.15.5;10.5.15.250;10.5.15.254;10.5.15.0/24
-            description: "External network to create for pod5 (name;type;first ip;last ip; gateway;network)"
-
+#####################################################
+# Parameters for none-CI PODs
+#####################################################
 - parameter:
-    name: 'intel-pod6-defaults'
+    name: 'ericsson-pod1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-pod6
+                - ericsson-pod1
             default-slaves:
-                - intel-pod6
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
+                - ericsson-pod1
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: CEPH_DISKS
-            default: /srv
-            description: "Disks to use by ceph (comma separated list)"
-        - string:
-            name: EXTERNAL_NETWORK
-            default: ext-net;flat;10.6.15.5;10.6.15.250;10.6.15.254;10.6.15.0/24
-            description: "External network to create for pod6 (name;type;first ip;last ip; gateway;network)"
-
 - parameter:
-    name: 'intel-pod7-defaults'
+    name: 'intel-pod2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-pod7
+                - intel-pod2
             default-slaves:
-                - intel-pod7
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
+                - intel-pod2
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'intel-pod8-defaults'
-    parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - intel-pod8
-            default-slaves:
-                - intel-pod8
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
-    name: 'huawei-build-defaults'
-    parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - huawei-build
-            default-slaves:
-                - huawei-build
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'huawei-pod1-defaults'
+    name: 'intel-pod3-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-pod1
+                - intel-pod3
             default-slaves:
-                - huawei-pod1
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
+                - intel-pod3
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'huawei-pod2-defaults'
     parameters:
                 - huawei-pod2
             default-slaves:
                 - huawei-pod2
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'huawei-pod3-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
             default: 'huawei-test'
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'huawei-pod4-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
             default: 'huawei-test'
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'juniper-pod1-defaults'
     parameters:
                 - juniper-pod1
             default-slaves:
                 - juniper-pod1
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             name: CEPH_DISKS
             default: /srv
             description: "Disks to use by ceph (comma separated list)"
-
 - parameter:
     name: 'orange-pod2-defaults'
     parameters:
                 - orange-pod2
             default-slaves:
                 - orange-pod2
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             name: EXTERNAL_NETWORK
             default: ext-net;flat;161.105.231.2;161.105.231.62;161.105.231.1;161.105.231.0/26
             description: "External network to create (name;type;first ip;last ip; gateway;network)"
-
 - parameter:
     name: 'orange-pod5-defaults'
     parameters:
                 - orange-pod5
             default-slaves:
                 - orange-pod5
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'ericsson-build-defaults'
-    parameters:
-        - label:
-            name: SLAVE_LABEL
-            default: 'ericsson-build'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on these Jenkins Slaves'
-
-- parameter:
-    name: 'intel-virtual2-defaults'
-    parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - intel-virtual2
-            default-slaves:
-                - intel-virtual2
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: SSH_KEY
-            default: /root/.ssh/id_rsa
-            description: 'SSH key to use for Apex'
-
 - parameter:
     name: 'dell-pod1-defaults'
     parameters:
                 - dell-pod1
             default-slaves:
                 - dell-pod1
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'dell-pod2-defaults'
     parameters:
                 - dell-pod2
             default-slaves:
                 - dell-pod2
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'nokia-pod1-defaults'
     parameters:
                 - nokia-pod1
             default-slaves:
                 - nokia-pod1
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'arm-build1-defaults'
-    parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - arm-build1
-            default-slaves:
-                - arm-build1
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'arm-pod1-defaults'
     parameters:
             name: LAB_CONFIG_URL
             default: ssh://git@git.enea.com/pharos/lab-config
             description: 'Base URI to the configuration directory'
-
 - parameter:
     name: 'arm-pod2-defaults'
     parameters:
             name: LAB_CONFIG_URL
             default: ssh://git@git.enea.com/pharos/lab-config
             description: 'Base URI to the configuration directory'
-
+#####################################################
+# These slaves are just dummy slaves for sandbox jobs
+#####################################################
 - parameter:
-    name: 'opnfv-build-centos-defaults'
+    name: 'sandbox-baremetal-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'opnfv-build-centos'
+            default: 'sandbox-baremetal'
+            description: 'Slave label on Jenkins'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             default: $WORKSPACE/build_output
             description: "Directory where the build artifact will be located upon the completion of the build."
 - parameter:
-    name: 'opnfv-build-ubuntu-defaults'
+    name: 'sandbox-virtual-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'opnfv-build-ubuntu'
+            default: 'sandbox-virtual-defaults'
+            description: 'Slave label on Jenkins'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: BUILD_DIRECTORY
+            default: $WORKSPACE/build_output
+            description: "Directory where the build artifact will be located upon the completion of the build."
+- parameter:
+    name: 'dummy-pod1-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'dummy-pod1-defaults'
             description: 'Slave label on Jenkins'
         - string:
             name: GIT_BASE
index d8866bd..c3459fd 100644 (file)
     triggers:
         - timed: ''
 
+- trigger:
+    name: 'weekly-trigger-disabled'
+    triggers:
+        - timed: ''
+
 - trigger:
     name: 'brahmaputra-trigger-daily-enabled'
     triggers:
diff --git a/jjb/sandbox/basic.sh b/jjb/sandbox/basic.sh
new file mode 100755 (executable)
index 0000000..2f9be27
--- /dev/null
@@ -0,0 +1,61 @@
+#!/bin/bash
+#set -o errexit
+#set -o nounset
+#set -o pipefail
+
+# get the job type
+# we only support verify, merge, daily and weekly jobs
+if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then
+    JOB_TYPE=${BASH_REMATCH[0]}
+else
+    echo "Unable to determine job type!"
+    exit 1
+fi
+
+# do stuff differently based on the job type
+case "$JOB_TYPE" in
+    verify)
+        echo "Running as part of verify job"
+        ;;
+    merge)
+        echo "Running as part of merge job"
+        ;;
+    daily)
+        echo "Running as part of daily job"
+        ;;
+    weekly)
+        echo "Running as part of weekly job"
+        ;;
+    *)
+        echo "Job type $JOB_TYPE is not supported!"
+        exit 1
+esac
+
+# this just shows we can get the patch/commit information
+# no matter what job we are executed by
+cd $WORKSPACE
+echo
+echo "Commit Message is"
+echo "-------------------------------------"
+git log --format=%B -n 1 $(git rev-parse HEAD)
+echo "-------------------------------------"
+echo
+echo "Repo contents"
+echo "-------------------------------------"
+ls -al
+echo "-------------------------------------"
+echo
+echo "Changed files are"
+echo "-------------------------------------"
+git diff origin/master --name-only
+echo "-------------------------------------"
+echo
+echo "Change introduced"
+echo "-------------------------------------"
+git diff origin/master
+echo "-------------------------------------"
+echo
+echo "git show"
+echo "-------------------------------------"
+git show
+echo "-------------------------------------"
diff --git a/jjb/sandbox/build.sh b/jjb/sandbox/build.sh
new file mode 100755 (executable)
index 0000000..2f9be27
--- /dev/null
@@ -0,0 +1,61 @@
+#!/bin/bash
+#set -o errexit
+#set -o nounset
+#set -o pipefail
+
+# get the job type
+# we only support verify, merge, daily and weekly jobs
+if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then
+    JOB_TYPE=${BASH_REMATCH[0]}
+else
+    echo "Unable to determine job type!"
+    exit 1
+fi
+
+# do stuff differently based on the job type
+case "$JOB_TYPE" in
+    verify)
+        echo "Running as part of verify job"
+        ;;
+    merge)
+        echo "Running as part of merge job"
+        ;;
+    daily)
+        echo "Running as part of daily job"
+        ;;
+    weekly)
+        echo "Running as part of weekly job"
+        ;;
+    *)
+        echo "Job type $JOB_TYPE is not supported!"
+        exit 1
+esac
+
+# this just shows we can get the patch/commit information
+# no matter what job we are executed by
+cd $WORKSPACE
+echo
+echo "Commit Message is"
+echo "-------------------------------------"
+git log --format=%B -n 1 $(git rev-parse HEAD)
+echo "-------------------------------------"
+echo
+echo "Repo contents"
+echo "-------------------------------------"
+ls -al
+echo "-------------------------------------"
+echo
+echo "Changed files are"
+echo "-------------------------------------"
+git diff origin/master --name-only
+echo "-------------------------------------"
+echo
+echo "Change introduced"
+echo "-------------------------------------"
+git diff origin/master
+echo "-------------------------------------"
+echo
+echo "git show"
+echo "-------------------------------------"
+git show
+echo "-------------------------------------"
diff --git a/jjb/sandbox/deploy.sh b/jjb/sandbox/deploy.sh
new file mode 100755 (executable)
index 0000000..2f9be27
--- /dev/null
@@ -0,0 +1,61 @@
+#!/bin/bash
+#set -o errexit
+#set -o nounset
+#set -o pipefail
+
+# get the job type
+# we only support verify, merge, daily and weekly jobs
+if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then
+    JOB_TYPE=${BASH_REMATCH[0]}
+else
+    echo "Unable to determine job type!"
+    exit 1
+fi
+
+# do stuff differently based on the job type
+case "$JOB_TYPE" in
+    verify)
+        echo "Running as part of verify job"
+        ;;
+    merge)
+        echo "Running as part of merge job"
+        ;;
+    daily)
+        echo "Running as part of daily job"
+        ;;
+    weekly)
+        echo "Running as part of weekly job"
+        ;;
+    *)
+        echo "Job type $JOB_TYPE is not supported!"
+        exit 1
+esac
+
+# this just shows we can get the patch/commit information
+# no matter what job we are executed by
+cd $WORKSPACE
+echo
+echo "Commit Message is"
+echo "-------------------------------------"
+git log --format=%B -n 1 $(git rev-parse HEAD)
+echo "-------------------------------------"
+echo
+echo "Repo contents"
+echo "-------------------------------------"
+ls -al
+echo "-------------------------------------"
+echo
+echo "Changed files are"
+echo "-------------------------------------"
+git diff origin/master --name-only
+echo "-------------------------------------"
+echo
+echo "Change introduced"
+echo "-------------------------------------"
+git diff origin/master
+echo "-------------------------------------"
+echo
+echo "git show"
+echo "-------------------------------------"
+git show
+echo "-------------------------------------"
diff --git a/jjb/sandbox/functest.sh b/jjb/sandbox/functest.sh
new file mode 100755 (executable)
index 0000000..2f9be27
--- /dev/null
@@ -0,0 +1,61 @@
+#!/bin/bash
+#set -o errexit
+#set -o nounset
+#set -o pipefail
+
+# get the job type
+# we only support verify, merge, daily and weekly jobs
+if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then
+    JOB_TYPE=${BASH_REMATCH[0]}
+else
+    echo "Unable to determine job type!"
+    exit 1
+fi
+
+# do stuff differently based on the job type
+case "$JOB_TYPE" in
+    verify)
+        echo "Running as part of verify job"
+        ;;
+    merge)
+        echo "Running as part of merge job"
+        ;;
+    daily)
+        echo "Running as part of daily job"
+        ;;
+    weekly)
+        echo "Running as part of weekly job"
+        ;;
+    *)
+        echo "Job type $JOB_TYPE is not supported!"
+        exit 1
+esac
+
+# this just shows we can get the patch/commit information
+# no matter what job we are executed by
+cd $WORKSPACE
+echo
+echo "Commit Message is"
+echo "-------------------------------------"
+git log --format=%B -n 1 $(git rev-parse HEAD)
+echo "-------------------------------------"
+echo
+echo "Repo contents"
+echo "-------------------------------------"
+ls -al
+echo "-------------------------------------"
+echo
+echo "Changed files are"
+echo "-------------------------------------"
+git diff origin/master --name-only
+echo "-------------------------------------"
+echo
+echo "Change introduced"
+echo "-------------------------------------"
+git diff origin/master
+echo "-------------------------------------"
+echo
+echo "git show"
+echo "-------------------------------------"
+git show
+echo "-------------------------------------"
diff --git a/jjb/sandbox/merge.sh b/jjb/sandbox/merge.sh
new file mode 100755 (executable)
index 0000000..2f9be27
--- /dev/null
@@ -0,0 +1,61 @@
+#!/bin/bash
+#set -o errexit
+#set -o nounset
+#set -o pipefail
+
+# get the job type
+# we only support verify, merge, daily and weekly jobs
+if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then
+    JOB_TYPE=${BASH_REMATCH[0]}
+else
+    echo "Unable to determine job type!"
+    exit 1
+fi
+
+# do stuff differently based on the job type
+case "$JOB_TYPE" in
+    verify)
+        echo "Running as part of verify job"
+        ;;
+    merge)
+        echo "Running as part of merge job"
+        ;;
+    daily)
+        echo "Running as part of daily job"
+        ;;
+    weekly)
+        echo "Running as part of weekly job"
+        ;;
+    *)
+        echo "Job type $JOB_TYPE is not supported!"
+        exit 1
+esac
+
+# this just shows we can get the patch/commit information
+# no matter what job we are executed by
+cd $WORKSPACE
+echo
+echo "Commit Message is"
+echo "-------------------------------------"
+git log --format=%B -n 1 $(git rev-parse HEAD)
+echo "-------------------------------------"
+echo
+echo "Repo contents"
+echo "-------------------------------------"
+ls -al
+echo "-------------------------------------"
+echo
+echo "Changed files are"
+echo "-------------------------------------"
+git diff origin/master --name-only
+echo "-------------------------------------"
+echo
+echo "Change introduced"
+echo "-------------------------------------"
+git diff origin/master
+echo "-------------------------------------"
+echo
+echo "git show"
+echo "-------------------------------------"
+git show
+echo "-------------------------------------"
diff --git a/jjb/sandbox/promote.sh b/jjb/sandbox/promote.sh
new file mode 100755 (executable)
index 0000000..2f9be27
--- /dev/null
@@ -0,0 +1,61 @@
+#!/bin/bash
+#set -o errexit
+#set -o nounset
+#set -o pipefail
+
+# get the job type
+# we only support verify, merge, daily and weekly jobs
+if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then
+    JOB_TYPE=${BASH_REMATCH[0]}
+else
+    echo "Unable to determine job type!"
+    exit 1
+fi
+
+# do stuff differently based on the job type
+case "$JOB_TYPE" in
+    verify)
+        echo "Running as part of verify job"
+        ;;
+    merge)
+        echo "Running as part of merge job"
+        ;;
+    daily)
+        echo "Running as part of daily job"
+        ;;
+    weekly)
+        echo "Running as part of weekly job"
+        ;;
+    *)
+        echo "Job type $JOB_TYPE is not supported!"
+        exit 1
+esac
+
+# this just shows we can get the patch/commit information
+# no matter what job we are executed by
+cd $WORKSPACE
+echo
+echo "Commit Message is"
+echo "-------------------------------------"
+git log --format=%B -n 1 $(git rev-parse HEAD)
+echo "-------------------------------------"
+echo
+echo "Repo contents"
+echo "-------------------------------------"
+ls -al
+echo "-------------------------------------"
+echo
+echo "Changed files are"
+echo "-------------------------------------"
+git diff origin/master --name-only
+echo "-------------------------------------"
+echo
+echo "Change introduced"
+echo "-------------------------------------"
+git diff origin/master
+echo "-------------------------------------"
+echo
+echo "git show"
+echo "-------------------------------------"
+git show
+echo "-------------------------------------"
diff --git a/jjb/sandbox/sandbox-daily-jobs.yml b/jjb/sandbox/sandbox-daily-jobs.yml
new file mode 100644 (file)
index 0000000..fc7244e
--- /dev/null
@@ -0,0 +1,264 @@
+- project:
+    name: 'sandbox-daily-jobs'
+
+    project: 'sandbox'
+
+    installer: 'sandbox'
+
+#--------------------------------
+# BRANCH ANCHORS
+#--------------------------------
+    master: &master
+        stream: master
+        branch: '{stream}'
+        gs-pathname: ''
+#--------------------------------
+# POD, INSTALLER, AND BRANCH MAPPING
+#--------------------------------
+#        CI PODs
+#--------------------------------
+    pod:
+        - baremetal:
+            slave-label: sandbox-baremetal
+            <<: *master
+        - virtual:
+            slave-label: fuel-virtual
+            <<: *master
+#--------------------------------
+#        None-CI PODs
+#--------------------------------
+        - dummy-pod1:
+            slave-label: dummy-pod1
+            <<: *master
+#--------------------------------
+#       scenarios
+#--------------------------------
+    scenario:
+        # HA scenarios
+        - 'os-nosdn-nofeature-ha':
+            auto-trigger-name: 'daily-trigger-disabled'
+        - 'os-odl_l2-nofeature-ha':
+            auto-trigger-name: 'daily-trigger-disabled'
+
+    jobs:
+        - 'sandbox-{scenario}-{pod}-daily-{stream}'
+        - 'sandbox-deploy-{pod}-daily-{stream}'
+        - 'yardstick-sandbox-{pod}-daily-{stream}'
+        - 'functest-sandbox-{pod}-daily-{stream}'
+
+########################
+# job templates
+########################
+- job-template:
+    name: 'sandbox-{scenario}-{pod}-daily-{stream}'
+
+    concurrent: false
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 4
+            max-per-node: 1
+            option: 'project'
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'sandbox-os-.*?-{pod}-daily-{stream}'
+            block-level: 'NODE'
+
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+
+    triggers:
+        - '{auto-trigger-name}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - '{installer}-defaults'
+        - '{slave-label}-defaults'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: '{scenario}'
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - trigger-builds:
+            - project: 'sandbox-deploy-{pod}-daily-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              same-node: true
+              block: true
+        - trigger-builds:
+            - project: 'yardstick-sandbox-{pod}-daily-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              same-node: true
+              block: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+            - project: 'functest-sandbox-{pod}-daily-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              block: true
+              same-node: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+
+- job-template:
+    name: 'sandbox-deploy-{pod}-daily-{stream}'
+
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 4
+            max-per-node: 1
+            option: 'project'
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'fuel-deploy-{pod}-daily-{stream}'
+                - 'fuel-deploy-generic-daily-.*'
+            block-level: 'NODE'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - '{installer}-defaults'
+        - '{slave-label}-defaults'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - 'sandbox-deploy-daily-builder'
+
+- job-template:
+    name: 'yardstick-sandbox-{pod}-daily-{stream}'
+
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-per-node: 1
+            option: 'project'
+
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER Suite: $YARDSTICK_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 400
+            abort: true
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - '{installer}-defaults'
+        - '{slave-label}-defaults':
+            installer: '{installer}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - 'yardstick-sandbox-daily-builder'
+
+- job-template:
+    name: 'functest-sandbox-{pod}-daily-{stream}'
+
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-per-node: 1
+            option: 'project'
+
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 400
+            abort: true
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - '{slave-label}-defaults'
+        - '{installer}-defaults'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - 'functest-sandbox-daily-builder'
+
+#####################################
+# builder macros
+#####################################
+- builder:
+    name: 'sandbox-deploy-daily-builder'
+    builders:
+        - shell:
+            !include-raw: ./deploy.sh
+
+- builder:
+    name: 'functest-sandbox-daily-builder'
+    builders:
+        - shell:
+            !include-raw: ./functest.sh
+
+- builder:
+    name: 'yardstick-sandbox-daily-builder'
+    builders:
+        - shell:
+            !include-raw: ./yardstick.sh
diff --git a/jjb/sandbox/sandbox-merge-jobs.yml b/jjb/sandbox/sandbox-merge-jobs.yml
new file mode 100644 (file)
index 0000000..69fcb43
--- /dev/null
@@ -0,0 +1,159 @@
+- project:
+    name: 'sandbox-merge-jobs'
+
+    project: 'sandbox'
+
+    installer: 'sandbox'
+
+    stream:
+        - master:
+            branch: '{stream}'
+            gs-pathname: ''
+
+# what are the verification activities we do for this installer
+    activity:
+        - 'basic'
+        - 'build'
+        - 'promote'
+
+    jobs:
+        - 'sandbox-merge-{stream}'
+        - 'sandbox-merge-{activity}-{stream}'
+
+- job-template:
+    name: 'sandbox-merge-{stream}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - 'opnfv-build-ubuntu-defaults'
+
+    wrappers:
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+        - timeout:
+            timeout: 360
+            fail: true
+
+    triggers:
+        - gerrit:
+            trigger-on:
+                - change-merged-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'remerge'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/{branch}'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'docs/**'
+            readable-message: true
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - '{project}-merge-builder'
+        - trigger-builds:
+            - project: 'sandbox-merge-basic-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+              block: true
+        - trigger-builds:
+            - project: 'sandbox-merge-build-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+              block: true
+        - trigger-builds:
+            - project: 'sandbox-merge-promote-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+              block: true
+
+- job-template:
+    name: 'sandbox-merge-{activity}-{stream}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            choosing-strategy: 'default'
+
+    wrappers:
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+        - timeout:
+            timeout: 360
+            fail: true
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - '{installer}-defaults'
+        - '{project}-merge-{activity}-parameter'
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - '{project}-merge-{activity}-builder'
+
+#####################################
+# parameter builders
+#####################################
+- parameter:
+    name: 'sandbox-merge-basic-parameter'
+    parameters:
+        - 'opnfv-build-ubuntu-defaults'
+
+- parameter:
+    name: 'sandbox-merge-build-parameter'
+    parameters:
+        - 'opnfv-build-ubuntu-defaults'
+
+- parameter:
+    name: 'sandbox-merge-promote-parameter'
+    parameters:
+        - 'opnfv-build-centos-defaults'
+#####################################
+# builder builders
+#####################################
+- builder:
+    name: 'sandbox-merge-builder'
+    builders:
+        - shell:
+            !include-raw: ./merge.sh
+
+- builder:
+    name: 'sandbox-merge-basic-builder'
+    builders:
+        - shell:
+            !include-raw: ./basic.sh
+
+- builder:
+    name: 'sandbox-merge-build-builder'
+    builders:
+        - shell:
+            !include-raw: ./build.sh
+
+- builder:
+    name: 'sandbox-merge-promote-builder'
+    builders:
+        - shell:
+            !include-raw: ./promote.sh
index b1e8e93..a899193 100644 (file)
 
     builders:
         - description-setter:
-            description: "POD: $NODE_NAME"
+            description: "Built on $NODE_NAME"
         - '{project}-verify-builder'
         - trigger-builds:
             - project: 'sandbox-verify-basic-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
               block: true
         - trigger-builds:
             - project: 'sandbox-verify-build-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
               block: true
         - trigger-builds:
             - project: 'sandbox-verify-deploy-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
               block: true
         - trigger-builds:
             - project: 'sandbox-verify-test-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
               block: true
 
 - job-template:
 
     builders:
         - description-setter:
-            description: "POD: $NODE_NAME"
+            description: "Built on $NODE_NAME"
         - '{project}-verify-{activity}-builder'
 
 #####################################
 - builder:
     name: 'sandbox-verify-builder'
     builders:
-        - shell: |
-            #!/bin/bash
-
-            # this is the builder for the parent/upstream job which we do nothing
-            cd $WORKSPACE
-            echo
-            echo "Commit Message is"
-            echo "-------------------------------------"
-            echo $GERRIT_CHANGE_COMMIT_MESSAGE
-            echo "-------------------------------------"
-            echo
-            echo "Repo contents"
-            echo "-------------------------------------"
-            ls -al
-            echo "-------------------------------------"
-            echo
-            echo "Changed files are"
-            echo "-------------------------------------"
-            git diff origin/master --name-only
-            echo "-------------------------------------"
-            echo
-            echo "Change introduced"
-            echo "-------------------------------------"
-            git diff origin/master
-            echo "-------------------------------------"
+        - shell:
+            !include-raw: ./verify.sh
 
 - builder:
     name: 'sandbox-verify-basic-builder'
     builders:
-        - shell: |
-            #!/bin/bash
-
-            # this is where we check the commit message, unit test, etc.
-            cd $WORKSPACE
-            echo
-            echo "Commit Message is"
-            echo "-------------------------------------"
-            echo $GERRIT_CHANGE_COMMIT_MESSAGE
-            echo "-------------------------------------"
-            echo
-            echo "Repo contents"
-            echo "-------------------------------------"
-            ls -al
-            echo "-------------------------------------"
-            echo
-            echo "Changed files are"
-            echo "-------------------------------------"
-            git diff origin/master --name-only
-            echo "-------------------------------------"
-            echo
-            echo "Change introduced"
-            echo "-------------------------------------"
-            git diff origin/master
-            echo "-------------------------------------"
+        - shell:
+            !include-raw: ./basic.sh
 
 - builder:
     name: 'sandbox-verify-build-builder'
     builders:
-        - shell: |
-            #!/bin/bash
-
-            # this is where we do the build
-            cd $WORKSPACE
-            echo
-            echo "Commit Message is"
-            echo "-------------------------------------"
-            echo $GERRIT_CHANGE_COMMIT_MESSAGE
-            echo "-------------------------------------"
-            echo
-            echo "Repo contents"
-            echo "-------------------------------------"
-            ls -al
-            echo "-------------------------------------"
-            echo
-            echo "Changed files are"
-            echo "-------------------------------------"
-            git diff origin/master --name-only
-            echo "-------------------------------------"
-            echo
-            echo "Change introduced"
-            echo "-------------------------------------"
-            git diff origin/master
-            echo "-------------------------------------"
+        - shell:
+            !include-raw: ./build.sh
 
 - builder:
     name: 'sandbox-verify-deploy-builder'
     builders:
-        - shell: |
-            #!/bin/bash
-
-            # this is where we start the virtual deployment
-            cd $WORKSPACE
-            echo
-            echo "Commit Message is"
-            echo "-------------------------------------"
-            echo $GERRIT_CHANGE_COMMIT_MESSAGE
-            echo "-------------------------------------"
-            echo
-            echo "Repo contents"
-            echo "-------------------------------------"
-            ls -al
-            echo "-------------------------------------"
-            echo
-            echo "Changed files are"
-            echo "-------------------------------------"
-            git diff origin/master --name-only
-            echo "-------------------------------------"
-            echo
-            echo "Change introduced"
-            echo "-------------------------------------"
-            git diff origin/master
-            echo "-------------------------------------"
+        - shell:
+            !include-raw: ./deploy.sh
 
 - builder:
     name: 'sandbox-verify-test-builder'
     builders:
-        - shell: |
-            #!/bin/bash
-
-            # this is where we do functest smoketest
-            cd $WORKSPACE
-            echo
-            echo "Commit Message is"
-            echo "-------------------------------------"
-            echo $GERRIT_CHANGE_COMMIT_MESSAGE
-            echo "-------------------------------------"
-            echo
-            echo "Repo contents"
-            echo "-------------------------------------"
-            ls -al
-            echo "-------------------------------------"
-            echo
-            echo "Changed files are"
-            echo "-------------------------------------"
-            git diff origin/master --name-only
-            echo "-------------------------------------"
-            echo
-            echo "Change introduced"
-            echo "-------------------------------------"
-            git diff origin/master
-            echo "-------------------------------------"
+        - shell:
+            !include-raw: ./test.sh
diff --git a/jjb/sandbox/sandbox-weekly-jobs.yml b/jjb/sandbox/sandbox-weekly-jobs.yml
new file mode 100644 (file)
index 0000000..52f8529
--- /dev/null
@@ -0,0 +1,264 @@
+- project:
+    name: 'sandbox-weekly-jobs'
+
+    project: 'sandbox'
+
+    installer: 'sandbox'
+
+#--------------------------------
+# BRANCH ANCHORS
+#--------------------------------
+    master: &master
+        stream: master
+        branch: '{stream}'
+        gs-pathname: ''
+#--------------------------------
+# POD, INSTALLER, AND BRANCH MAPPING
+#--------------------------------
+#        CI PODs
+#--------------------------------
+    pod:
+        - baremetal:
+            slave-label: sandbox-baremetal
+            <<: *master
+        - virtual:
+            slave-label: fuel-virtual
+            <<: *master
+#--------------------------------
+#        None-CI PODs
+#--------------------------------
+        - dummy-pod1:
+            slave-label: dummy-pod1
+            <<: *master
+#--------------------------------
+#       scenarios
+#--------------------------------
+    scenario:
+        # HA scenarios
+        - 'os-nosdn-nofeature-ha':
+            auto-trigger-name: 'weekly-trigger-disabled'
+        - 'os-odl_l2-nofeature-ha':
+            auto-trigger-name: 'weekly-trigger-disabled'
+
+    jobs:
+        - 'sandbox-{scenario}-{pod}-weekly-{stream}'
+        - 'sandbox-deploy-{pod}-weekly-{stream}'
+        - 'yardstick-sandbox-{pod}-weekly-{stream}'
+        - 'functest-sandbox-{pod}-weekly-{stream}'
+
+########################
+# job templates
+########################
+- job-template:
+    name: 'sandbox-{scenario}-{pod}-weekly-{stream}'
+
+    concurrent: false
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 4
+            max-per-node: 1
+            option: 'project'
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'sandbox-os-.*?-{pod}-weekly-{stream}'
+            block-level: 'NODE'
+
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+
+    triggers:
+        - '{auto-trigger-name}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - '{installer}-defaults'
+        - '{slave-label}-defaults'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: '{scenario}'
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - trigger-builds:
+            - project: 'sandbox-deploy-{pod}-weekly-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              same-node: true
+              block: true
+        - trigger-builds:
+            - project: 'yardstick-sandbox-{pod}-weekly-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              same-node: true
+              block: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+            - project: 'functest-sandbox-{pod}-weekly-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              block: true
+              same-node: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+
+- job-template:
+    name: 'sandbox-deploy-{pod}-weekly-{stream}'
+
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 4
+            max-per-node: 1
+            option: 'project'
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'fuel-deploy-{pod}-weekly-{stream}'
+                - 'fuel-deploy-generic-weekly-.*'
+            block-level: 'NODE'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - '{installer}-defaults'
+        - '{slave-label}-defaults'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - 'sandbox-deploy-weekly-builder'
+
+- job-template:
+    name: 'yardstick-sandbox-{pod}-weekly-{stream}'
+
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-per-node: 1
+            option: 'project'
+
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER Suite: $YARDSTICK_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 400
+            abort: true
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - '{installer}-defaults'
+        - '{slave-label}-defaults':
+            installer: '{installer}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - 'yardstick-sandbox-weekly-builder'
+
+- job-template:
+    name: 'functest-sandbox-{pod}-weekly-{stream}'
+
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-per-node: 1
+            option: 'project'
+
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 400
+            abort: true
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - '{slave-label}-defaults'
+        - '{installer}-defaults'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - 'functest-sandbox-weekly-builder'
+
+#####################################
+# builder macros
+#####################################
+- builder:
+    name: 'sandbox-deploy-weekly-builder'
+    builders:
+        - shell:
+            !include-raw: ./deploy.sh
+
+- builder:
+    name: 'functest-sandbox-weekly-builder'
+    builders:
+        - shell:
+            !include-raw: ./functest.sh
+
+- builder:
+    name: 'yardstick-sandbox-weekly-builder'
+    builders:
+        - shell:
+            !include-raw: ./yardstick.sh
diff --git a/jjb/sandbox/test.sh b/jjb/sandbox/test.sh
new file mode 100755 (executable)
index 0000000..2f9be27
--- /dev/null
@@ -0,0 +1,61 @@
+#!/bin/bash
+#set -o errexit
+#set -o nounset
+#set -o pipefail
+
+# get the job type
+# we only support verify, merge, daily and weekly jobs
+if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then
+    JOB_TYPE=${BASH_REMATCH[0]}
+else
+    echo "Unable to determine job type!"
+    exit 1
+fi
+
+# do stuff differently based on the job type
+case "$JOB_TYPE" in
+    verify)
+        echo "Running as part of verify job"
+        ;;
+    merge)
+        echo "Running as part of merge job"
+        ;;
+    daily)
+        echo "Running as part of daily job"
+        ;;
+    weekly)
+        echo "Running as part of weekly job"
+        ;;
+    *)
+        echo "Job type $JOB_TYPE is not supported!"
+        exit 1
+esac
+
+# this just shows we can get the patch/commit information
+# no matter what job we are executed by
+cd $WORKSPACE
+echo
+echo "Commit Message is"
+echo "-------------------------------------"
+git log --format=%B -n 1 $(git rev-parse HEAD)
+echo "-------------------------------------"
+echo
+echo "Repo contents"
+echo "-------------------------------------"
+ls -al
+echo "-------------------------------------"
+echo
+echo "Changed files are"
+echo "-------------------------------------"
+git diff origin/master --name-only
+echo "-------------------------------------"
+echo
+echo "Change introduced"
+echo "-------------------------------------"
+git diff origin/master
+echo "-------------------------------------"
+echo
+echo "git show"
+echo "-------------------------------------"
+git show
+echo "-------------------------------------"
diff --git a/jjb/sandbox/verify.sh b/jjb/sandbox/verify.sh
new file mode 100755 (executable)
index 0000000..f62d2b9
--- /dev/null
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# this is where we check the commit message, unit test, etc.
+cd $WORKSPACE
+echo
+echo "Commit Message is"
+echo "-------------------------------------"
+git log --format=%B -n 1 $(git rev-parse HEAD)
+echo "-------------------------------------"
+echo
+echo "Repo contents"
+echo "-------------------------------------"
+ls -al
+echo "-------------------------------------"
+echo
+echo "Changed files are"
+echo "-------------------------------------"
+git diff origin/master --name-only
+echo "-------------------------------------"
+echo
+echo "Change introduced"
+echo "-------------------------------------"
+git diff origin/master
+echo "-------------------------------------"
+echo
+echo "git show"
+echo "-------------------------------------"
+git show
+echo "-------------------------------------"
diff --git a/jjb/sandbox/yardstick.sh b/jjb/sandbox/yardstick.sh
new file mode 100755 (executable)
index 0000000..2f9be27
--- /dev/null
@@ -0,0 +1,61 @@
+#!/bin/bash
+#set -o errexit
+#set -o nounset
+#set -o pipefail
+
+# get the job type
+# we only support verify, merge, daily and weekly jobs
+if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then
+    JOB_TYPE=${BASH_REMATCH[0]}
+else
+    echo "Unable to determine job type!"
+    exit 1
+fi
+
+# do stuff differently based on the job type
+case "$JOB_TYPE" in
+    verify)
+        echo "Running as part of verify job"
+        ;;
+    merge)
+        echo "Running as part of merge job"
+        ;;
+    daily)
+        echo "Running as part of daily job"
+        ;;
+    weekly)
+        echo "Running as part of weekly job"
+        ;;
+    *)
+        echo "Job type $JOB_TYPE is not supported!"
+        exit 1
+esac
+
+# this just shows we can get the patch/commit information
+# no matter what job we are executed by
+cd $WORKSPACE
+echo
+echo "Commit Message is"
+echo "-------------------------------------"
+git log --format=%B -n 1 $(git rev-parse HEAD)
+echo "-------------------------------------"
+echo
+echo "Repo contents"
+echo "-------------------------------------"
+ls -al
+echo "-------------------------------------"
+echo
+echo "Changed files are"
+echo "-------------------------------------"
+git diff origin/master --name-only
+echo "-------------------------------------"
+echo
+echo "Change introduced"
+echo "-------------------------------------"
+git diff origin/master
+echo "-------------------------------------"
+echo
+echo "git show"
+echo "-------------------------------------"
+git show
+echo "-------------------------------------"
index 8b8ced1..21a6b80 100644 (file)
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *brahmaputra
-
-# just in case if things go wrong
-        - lf-pod2:
-            slave-label: '{pod}'
-            installer: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-
 # joid CI PODs
         - baremetal:
             slave-label: joid-baremetal
index c6f3173..5973fce 100644 (file)
@@ -31,7 +31,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -70,7 +70,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - string:
             name: GS_URL
             default: '$GS_BASE{gs-pathname}'
index 8c41620..d268a28 100755 (executable)
@@ -48,6 +48,14 @@ main () {
         exit 1
     fi
 
+    if [[ $(whoami) != "root" ]]; then
+      if grep "^Defaults requiretty" /etc/sudoers
+        then echo "please comment out Defaults requiretty from /etc/sudoers"
+        exit 1
+      fi
+    fi
+
+
     if [ -d /etc/monit/conf.d ]; then
         monitconfdir="/etc/monit/conf.d/"
     elif [ -d /etc/monit.d ]; then
@@ -87,7 +95,7 @@ main () {
         echo "Writing the following as monit config:"
         cat << EOF | tee $monitconfdir/jenkins
 check process jenkins with pidfile /var/run/$jenkinsuser/jenkins_jnlp_pid
-start program = "/usr/bin/sudo -u $jenkinsuser /bin/bash -c 'cd $dir; export started_monit=true; $0 $@'"
+start program = "/usr/bin/sudo -u $jenkinsuser /bin/bash -c 'cd $dir; export started_monit=true; $0 $@' with timeout 60 seconds"
 stop program = "/bin/bash -c '/bin/kill \$(/bin/cat /var/run/$jenkinsuser/jenkins_jnlp_pid)'"
 EOF
     }
@@ -96,7 +104,7 @@ EOF
         #test for diff
         if [[ "$(diff $monitconfdir/jenkins <(echo "\
 check process jenkins with pidfile /var/run/$jenkinsuser/jenkins_jnlp_pid
-start program = \"/usr/bin/sudo -u $jenkinsuser /bin/bash -c 'cd $dir; export started_monit=true; $0 $@'\"
+start program = \"/usr/bin/sudo -u $jenkinsuser /bin/bash -c 'cd $dir; export started_monit=true; $0 $@' with timeout 60 seconds\"
 stop program = \"/bin/bash -c '/bin/kill \$(/bin/cat /var/run/$jenkinsuser/jenkins_jnlp_pid)'\"\
 ") )" ]]; then
             echo "Updating monit config..."
old mode 100644 (file)
new mode 100755 (executable)
index 9a8986c..7e50623
@@ -15,6 +15,8 @@
 # limitations under the License.
 ##############################################################################
 
+PATH=$PATH:/usr/local/bin/
+
 #These are the only projects that generate artifacts
 for x in armband ovsnfv fuel apex compass4nfv
 do
@@ -28,9 +30,9 @@ do
     daysold=$(($age/86400))
 
     if [[ "$daysold" -gt "10" ]]; then
-      echo "$daysold Days old Deleting: $(basename $artifact)"
+      echo "$daysold Days old deleting: $(basename $artifact)"
     else
-      echo "$daysold Days old Retaining: $(basename $artifact)"
+      echo "$daysold Days old retaining: $(basename $artifact)"
     fi
 
   done < <(gsutil ls gs://artifacts.opnfv.org/"$x" |grep -v "/$")