summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INFO1
-rw-r--r--jjb/apex/apex.yml25
-rw-r--r--jjb/apex/apex.yml.j23
-rw-r--r--jjb/apex/scenarios.yaml.hidden2
-rw-r--r--jjb/xci/bifrost-cleanup-job.yml8
-rw-r--r--jjb/xci/bifrost-periodic-jobs.yml2
-rwxr-xr-xjjb/xci/bifrost-provision.sh10
-rw-r--r--jjb/xci/bifrost-verify-jobs.yml8
-rwxr-xr-xjjb/xci/bifrost-verify.sh6
-rw-r--r--jjb/xci/osa-periodic-jobs.yml2
-rw-r--r--jjb/xci/xci-daily-jobs.yml2
-rwxr-xr-xjjb/xci/xci-deploy.sh4
12 files changed, 48 insertions, 25 deletions
diff --git a/INFO b/INFO
index 0fb358217..38ac5b3d2 100644
--- a/INFO
+++ b/INFO
@@ -9,6 +9,7 @@ Jira Project Prefix: RELENG
Mailing list tag: [releng]
IRC: Server:freenode.net Channel:#opnfv-octopus
Repository: releng
+Other Repositories: releng-xci
Committers:
Fatih Degirmenci (Ericsson, fatih.degirmenci@ericsson.com)
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 26eddb5b2..07181fcad 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -132,6 +132,10 @@
<<: *master
- 'os-odl-sfc-ha':
<<: *master
+ - 'os-odl-fdio-dvr-noha':
+ <<: *master
+ - 'os-odl-fdio-dvr-ha':
+ <<: *master
platform:
- 'baremetal'
@@ -669,7 +673,7 @@
description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
- multijob:
name: 'Baremetal Deploy'
- condition: ALWAYS
+ condition: SUCCESSFUL
projects:
- name: 'apex-deploy-baremetal-{scenario_stream}'
node-parameters: true
@@ -684,7 +688,6 @@
git-revision: false
- multijob:
name: 'OPNFV Test Suite'
- condition: SUCCESSFUL
projects:
- name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
node-parameters: true
@@ -1332,6 +1335,24 @@
abort-all-job: true
git-revision: false
+ - name: 'apex-os-odl-fdio-dvr-noha-baremetal-master'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
+
+ - name: 'apex-os-odl-fdio-dvr-ha-baremetal-master'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
+
# snapshot create
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 5d7f150cd..2d760f854 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -585,7 +585,7 @@
description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
- multijob:
name: 'Baremetal Deploy'
- condition: ALWAYS
+ condition: SUCCESSFUL
projects:
- name: 'apex-deploy-baremetal-{scenario_stream}'
node-parameters: true
@@ -600,7 +600,6 @@
git-revision: false
- multijob:
name: 'OPNFV Test Suite'
- condition: SUCCESSFUL
projects:
- name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
node-parameters: true
diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index f49fa83c7..def4e796a 100644
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -18,6 +18,8 @@ master:
- 'os-nosdn-kvm_ovs_dpdk-ha'
- 'os-odl-sfc-noha'
- 'os-odl-sfc-ha'
+ - 'os-odl-fdio-dvr-noha'
+ - 'os-odl-fdio-dvr-ha'
danube:
- 'os-nosdn-nofeature-noha'
- 'os-nosdn-nofeature-ha'
diff --git a/jjb/xci/bifrost-cleanup-job.yml b/jjb/xci/bifrost-cleanup-job.yml
index 998464a5e..6f3f51a6d 100644
--- a/jjb/xci/bifrost-cleanup-job.yml
+++ b/jjb/xci/bifrost-cleanup-job.yml
@@ -15,8 +15,8 @@
project-repo: 'https://git.openstack.org/openstack/bifrost'
clone-location: '/opt/bifrost'
- 'opnfv':
- project-repo: 'https://gerrit.opnfv.org/gerrit/releng'
- clone-location: '/opt/releng'
+ project-repo: 'https://gerrit.opnfv.org/gerrit/releng-xci'
+ clone-location: '/opt/releng-xci'
#--------------------------------
# jobs
@@ -132,11 +132,11 @@
silent-start: true
projects:
- project-compare-type: 'ANT'
- project-pattern: 'releng'
+ project-pattern: 'releng-xci'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
file-paths:
- compare-type: ANT
- pattern: 'prototypes/bifrost/**'
+ pattern: 'bifrost/**'
readable-message: true
diff --git a/jjb/xci/bifrost-periodic-jobs.yml b/jjb/xci/bifrost-periodic-jobs.yml
index 9773cfd9e..7ef11a4cf 100644
--- a/jjb/xci/bifrost-periodic-jobs.yml
+++ b/jjb/xci/bifrost-periodic-jobs.yml
@@ -1,5 +1,5 @@
- project:
- project: 'releng'
+ project: 'releng-xci'
name: 'bifrost-periodic'
#--------------------------------
diff --git a/jjb/xci/bifrost-provision.sh b/jjb/xci/bifrost-provision.sh
index b37da9059..4d646a676 100755
--- a/jjb/xci/bifrost-provision.sh
+++ b/jjb/xci/bifrost-provision.sh
@@ -38,7 +38,7 @@ if [[ ! "$DISTRO" =~ (xenial|centos7|suse) ]]; then
fi
# remove previously cloned repos
-sudo /bin/rm -rf /opt/bifrost /opt/openstack-ansible /opt/releng /opt/functest
+sudo /bin/rm -rf /opt/bifrost /opt/openstack-ansible /opt/releng-xci /opt/functest
# Fix up permissions
fix_ownership
@@ -65,16 +65,16 @@ cd /opt/bifrost && sudo git checkout --quiet $OPENSTACK_BIFROST_VERSION
echo "xci: using bifrost commit"
git show --oneline -s --pretty=format:'%h - %s (%cr) <%an>'
-sudo git clone --quiet https://gerrit.opnfv.org/gerrit/releng /opt/releng
-cd /opt/releng && sudo git checkout --quiet $OPNFV_RELENG_VERSION
+sudo git clone --quiet https://gerrit.opnfv.org/gerrit/releng-xci /opt/releng-xci
+cd /opt/releng-xci && sudo git checkout --quiet $OPNFV_RELENG_VERSION
echo "xci: using releng commit"
git show --oneline -s --pretty=format:'%h - %s (%cr) <%an>'
# source flavor vars
-source "$WORKSPACE/prototypes/xci/config/${XCI_FLAVOR}-vars"
+source "$WORKSPACE/xci/config/${XCI_FLAVOR}-vars"
# combine opnfv and upstream scripts/playbooks
-sudo /bin/cp -rf /opt/releng/prototypes/bifrost/* /opt/bifrost/
+sudo /bin/cp -rf /opt/releng-xci/bifrost/* /opt/bifrost/
# cleanup remnants of previous deployment
cd /opt/bifrost
diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index fbe7ecf41..507147684 100644
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -14,8 +14,8 @@
project-repo: 'https://git.openstack.org/openstack/bifrost'
clone-location: '$WORKSPACE/bifrost'
- 'opnfv':
- project-repo: 'https://gerrit.opnfv.org/gerrit/releng'
- clone-location: '$WORKSPACE/releng'
+ project-repo: 'https://gerrit.opnfv.org/gerrit/releng-xci'
+ clone-location: '$WORKSPACE/releng-xci'
#--------------------------------
# distros
#--------------------------------
@@ -220,13 +220,13 @@
custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'releng'
+ project-pattern: 'releng-xci'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
file-paths:
- compare-type: ANT
- pattern: 'prototypes/bifrost/**'
+ pattern: 'bifrost/**'
readable-message: true
#---------------------------
diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh
index b522b8969..14c8d37e9 100755
--- a/jjb/xci/bifrost-verify.sh
+++ b/jjb/xci/bifrost-verify.sh
@@ -95,21 +95,21 @@ if [[ ! "$DISTRO" =~ (xenial|centos7|suse) ]]; then
fi
# remove previously cloned repos
-/bin/rm -rf $WORKSPACE/bifrost $WORKSPACE/releng
+/bin/rm -rf $WORKSPACE/bifrost $WORKSPACE/releng-xci
# Fix up permissions
fix_ownership
# clone all the repos first and checkout the patch afterwards
git clone https://git.openstack.org/openstack/bifrost $WORKSPACE/bifrost
-git clone https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/releng
+git clone https://gerrit.opnfv.org/gerrit/releng-xci $WORKSPACE/releng-xci
# checkout the patch
cd $CLONE_LOCATION
git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD
# combine opnfv and upstream scripts/playbooks
-/bin/cp -rf $WORKSPACE/releng/prototypes/bifrost/* $WORKSPACE/bifrost/
+/bin/cp -rf $WORKSPACE/releng-xci/bifrost/* $WORKSPACE/bifrost/
# cleanup remnants of previous deployment
cd $WORKSPACE/bifrost
diff --git a/jjb/xci/osa-periodic-jobs.yml b/jjb/xci/osa-periodic-jobs.yml
index 722b077ac..350ee766b 100644
--- a/jjb/xci/osa-periodic-jobs.yml
+++ b/jjb/xci/osa-periodic-jobs.yml
@@ -1,5 +1,5 @@
- project:
- project: 'releng'
+ project: 'releng-xci'
name: 'os-periodic'
#--------------------------------
diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index b582772c2..42079b2f5 100644
--- a/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@ -6,7 +6,7 @@
# are checked out based on what is configured.
#--------------------------------
- project:
- project: 'releng'
+ project: 'releng-xci'
name: 'xci-daily'
#--------------------------------
diff --git a/jjb/xci/xci-deploy.sh b/jjb/xci/xci-deploy.sh
index 8ad637805..211d282d3 100755
--- a/jjb/xci/xci-deploy.sh
+++ b/jjb/xci/xci-deploy.sh
@@ -11,7 +11,7 @@ set -o errexit
set -o nounset
set -o pipefail
-cd $WORKSPACE/prototypes/xci
+cd $WORKSPACE/xci
# for daily jobs, we want to use working versions
# for periodic jobs, we will use whatever is set in the job, probably master
@@ -53,7 +53,7 @@ if [[ "$XCI_LOOP" == "periodic" && "$OPENSTACK_OSA_VERSION" == "master" ]]; then
fi
# proceed with the deployment
-cd $WORKSPACE/prototypes/xci
+cd $WORKSPACE/xci
./xci-deploy.sh
if [[ "$JOB_NAME" =~ "periodic" && "$OPENSTACK_OSA_VERSION" == "master" ]]; then