summaryrefslogtreecommitdiffstats
path: root/jjb/apex
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/apex')
-rwxr-xr-xjjb/apex/apex-deploy.sh1
-rwxr-xr-xjjb/apex/apex-workspace-cleanup.sh7
-rw-r--r--jjb/apex/apex.yml143
-rw-r--r--jjb/apex/apex.yml.j2143
4 files changed, 267 insertions, 27 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index a47e3a5db..6de12d4b9 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -50,6 +50,7 @@ if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
# Install dev build
mkdir -p ~/tmp
+ rm -rf ~/tmp/.build
mv -f .build ~/tmp/
sudo pip3 install --upgrade --force-reinstall .
mv -f ~/tmp/.build .
diff --git a/jjb/apex/apex-workspace-cleanup.sh b/jjb/apex/apex-workspace-cleanup.sh
deleted file mode 100755
index d2f71a562..000000000
--- a/jjb/apex/apex-workspace-cleanup.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -o errexit
-set -o nounset
-set -o pipefail
-
-# delete everything that is in $WORKSPACE
-sudo /bin/rm -rf $WORKSPACE
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index bdce67a44..c71bee1d0 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -15,6 +15,7 @@
- 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
- 'apex-upload-snapshot'
- 'apex-create-snapshot'
+ - 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}'
# stream: branch with - in place of / (eg. stable-arno)
# branch: branch (eg. stable/arno)
stream:
@@ -174,9 +175,37 @@
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
+ disable-strict-forbidden-file-verification: 'false'
file-paths:
- compare-type: ANT
pattern: 'apex/tests/**'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: '*'
+ - compare-type: ANT
+ pattern: 'apex/*'
+ - compare-type: ANT
+ pattern: 'build/**'
+ - compare-type: ANT
+ pattern: 'lib/**'
+ - compare-type: ANT
+ pattern: 'config/**'
+ - compare-type: ANT
+ pattern: 'apex/build/**'
+ - compare-type: ANT
+ pattern: 'apex/common/**'
+ - compare-type: ANT
+ pattern: 'apex/inventory/**'
+ - compare-type: ANT
+ pattern: 'apex/network/**'
+ - compare-type: ANT
+ pattern: 'apex/overcloud/**'
+ - compare-type: ANT
+ pattern: 'apex/settings/**'
+ - compare-type: ANT
+ pattern: 'apex/undercloud/**'
+ - compare-type: ANT
+ pattern: 'apex/virtual/**'
properties:
- logrotate-default
- throttle:
@@ -230,9 +259,12 @@
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
+ disable-strict-forbidden-file-verification: 'true'
file-paths:
- compare-type: ANT
- pattern: 'ci/**'
+ pattern: '*'
+ - compare-type: ANT
+ pattern: 'apex/*'
- compare-type: ANT
pattern: 'build/**'
- compare-type: ANT
@@ -240,7 +272,26 @@
- compare-type: ANT
pattern: 'config/**'
- compare-type: ANT
- pattern: 'apex/**'
+ pattern: 'apex/build/**'
+ - compare-type: ANT
+ pattern: 'apex/common/**'
+ - compare-type: ANT
+ pattern: 'apex/inventory/**'
+ - compare-type: ANT
+ pattern: 'apex/network/**'
+ - compare-type: ANT
+ pattern: 'apex/overcloud/**'
+ - compare-type: ANT
+ pattern: 'apex/settings/**'
+ - compare-type: ANT
+ pattern: 'apex/undercloud/**'
+ - compare-type: ANT
+ pattern: 'apex/virtual/**'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'apex/tests/**'
+ - compare-type: ANT
+ pattern: 'docs/**'
properties:
- logrotate-default
@@ -551,7 +602,7 @@
description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
- 'apex-download-artifact'
- 'apex-deploy'
- - 'apex-workspace-cleanup'
+ - 'clean-workspace'
# Baremetal Deploy and Test
@@ -1527,6 +1578,85 @@
abort-all-job: true
git-revision: false
+# Flex job
+- job-template:
+ name: 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}'
+
+ project-type: 'multijob'
+
+ disabled: false
+
+ node: 'flex-pod2'
+
+ scm:
+ - git-scm
+ triggers:
+ - 'apex-{stream}'
+ parameters:
+ - '{project}-defaults'
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - apex-parameter:
+ gs-pathname: '{gs-pathname}'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-nosdn-nofeature-ha'
+ description: "Scenario to deploy with."
+ - 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'
+ properties:
+ - logrotate-default
+ - build-blocker:
+ use-build-blocker: true
+ block-level: 'NODE'
+ blocking-jobs:
+ - 'apex-verify.*'
+ - 'apex-runner.*'
+ - 'apex-.*-promote.*'
+ - 'apex-run.*'
+ - 'apex-.+-baremetal-.+'
+ - throttle:
+ max-per-node: 1
+ max-total: 10
+ option: 'project'
+ builders:
+ - description-setter:
+ description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
+ - multijob:
+ name: 'Baremetal Deploy'
+ condition: SUCCESSFUL
+ projects:
+ - name: 'apex-deploy-baremetal-{stream}'
+ node-parameters: true
+ current-parameters: true
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ kill-phase-on: FAILURE
+ abort-all-job: true
+ git-revision: false
+ - multijob:
+ name: Yardstick
+ condition: ALWAYS
+ projects:
+ - name: 'yardstick-apex-baremetal-daily-{stream}'
+ node-parameters: true
+ current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ kill-phase-on: NEVER
+ abort-all-job: false
+ git-revision: false
+
########################
# parameter macros
########################
@@ -1576,13 +1706,6 @@
!include-raw: ./apex-unit-test.sh
- builder:
- name: 'apex-workspace-cleanup'
- builders:
- - shell:
- !include-raw: ./apex-workspace-cleanup.sh
-
-
-- builder:
name: 'apex-upload-artifact'
builders:
- shell:
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 514dd49bf..356c718d5 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -15,6 +15,7 @@
- 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
- 'apex-upload-snapshot'
- 'apex-create-snapshot'
+ - 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}'
# stream: branch with - in place of / (eg. stable-arno)
# branch: branch (eg. stable/arno)
stream:
@@ -86,9 +87,37 @@
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
+ disable-strict-forbidden-file-verification: 'false'
file-paths:
- compare-type: ANT
pattern: 'apex/tests/**'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: '*'
+ - compare-type: ANT
+ pattern: 'apex/*'
+ - compare-type: ANT
+ pattern: 'build/**'
+ - compare-type: ANT
+ pattern: 'lib/**'
+ - compare-type: ANT
+ pattern: 'config/**'
+ - compare-type: ANT
+ pattern: 'apex/build/**'
+ - compare-type: ANT
+ pattern: 'apex/common/**'
+ - compare-type: ANT
+ pattern: 'apex/inventory/**'
+ - compare-type: ANT
+ pattern: 'apex/network/**'
+ - compare-type: ANT
+ pattern: 'apex/overcloud/**'
+ - compare-type: ANT
+ pattern: 'apex/settings/**'
+ - compare-type: ANT
+ pattern: 'apex/undercloud/**'
+ - compare-type: ANT
+ pattern: 'apex/virtual/**'
properties:
- logrotate-default
- throttle:
@@ -142,9 +171,12 @@
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
+ disable-strict-forbidden-file-verification: 'true'
file-paths:
- compare-type: ANT
- pattern: 'ci/**'
+ pattern: '*'
+ - compare-type: ANT
+ pattern: 'apex/*'
- compare-type: ANT
pattern: 'build/**'
- compare-type: ANT
@@ -152,7 +184,26 @@
- compare-type: ANT
pattern: 'config/**'
- compare-type: ANT
- pattern: 'apex/**'
+ pattern: 'apex/build/**'
+ - compare-type: ANT
+ pattern: 'apex/common/**'
+ - compare-type: ANT
+ pattern: 'apex/inventory/**'
+ - compare-type: ANT
+ pattern: 'apex/network/**'
+ - compare-type: ANT
+ pattern: 'apex/overcloud/**'
+ - compare-type: ANT
+ pattern: 'apex/settings/**'
+ - compare-type: ANT
+ pattern: 'apex/undercloud/**'
+ - compare-type: ANT
+ pattern: 'apex/virtual/**'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'apex/tests/**'
+ - compare-type: ANT
+ pattern: 'docs/**'
properties:
- logrotate-default
@@ -463,7 +514,7 @@
description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
- 'apex-download-artifact'
- 'apex-deploy'
- - 'apex-workspace-cleanup'
+ - 'clean-workspace'
# Baremetal Deploy and Test
@@ -954,6 +1005,85 @@
abort-all-job: true
git-revision: false
+# Flex job
+- job-template:
+ name: 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}'
+
+ project-type: 'multijob'
+
+ disabled: false
+
+ node: 'flex-pod2'
+
+ scm:
+ - git-scm
+ triggers:
+ - 'apex-{stream}'
+ parameters:
+ - '{project}-defaults'
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - apex-parameter:
+ gs-pathname: '{gs-pathname}'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-nosdn-nofeature-ha'
+ description: "Scenario to deploy with."
+ - 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'
+ properties:
+ - logrotate-default
+ - build-blocker:
+ use-build-blocker: true
+ block-level: 'NODE'
+ blocking-jobs:
+ - 'apex-verify.*'
+ - 'apex-runner.*'
+ - 'apex-.*-promote.*'
+ - 'apex-run.*'
+ - 'apex-.+-baremetal-.+'
+ - throttle:
+ max-per-node: 1
+ max-total: 10
+ option: 'project'
+ builders:
+ - description-setter:
+ description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
+ - multijob:
+ name: 'Baremetal Deploy'
+ condition: SUCCESSFUL
+ projects:
+ - name: 'apex-deploy-baremetal-{stream}'
+ node-parameters: true
+ current-parameters: true
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ kill-phase-on: FAILURE
+ abort-all-job: true
+ git-revision: false
+ - multijob:
+ name: Yardstick
+ condition: ALWAYS
+ projects:
+ - name: 'yardstick-apex-baremetal-daily-{stream}'
+ node-parameters: true
+ current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ kill-phase-on: NEVER
+ abort-all-job: false
+ git-revision: false
+
########################
# parameter macros
########################
@@ -1003,13 +1133,6 @@
!include-raw: ./apex-unit-test.sh
- builder:
- name: 'apex-workspace-cleanup'
- builders:
- - shell:
- !include-raw: ./apex-workspace-cleanup.sh
-
-
-- builder:
name: 'apex-upload-artifact'
builders:
- shell: