summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/functest.yml10
-rw-r--r--jjb/genesis/genesis-foreman.yml12
2 files changed, 17 insertions, 5 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index c4dfe4eaf..7def7249a 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -280,8 +280,14 @@
name: functest-all
builders:
- shell: |
+ echo "Functest: prepare Functest environment"
+ source $HOME/functest/opnfv-openrc.sh
+ python $HOME/functest/config_functest.py start
echo "Functest: run Functest suites"
- python $HOME/.functest/run_rally.py all
- python $HOME/.functest/run_rally.py smoke
+ python $HOME/.functest/Rally_test/run_rally.py all
+ python $HOME/.functest/Rally_test/run_rally.py tempest smoke
python $HOME/.functest/vPing/vPing.py
$HOME/.functest/ODL/start_tests.sh
+ echo "Functest: clean Functest environment"
+ python $HOME/functest/config_functest.py clean
+
diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index d5fe121fa..8da32797d 100644
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -170,6 +170,8 @@
node: ericsson-build
+ disabled: true
+
parameters:
- genesis-parameters:
installer: '{installer}'
@@ -196,9 +198,11 @@
- project: 'genesis-{installer}-build'
git-revision: true
block: true
+ - trigger-builds:
- project: 'genesis-{installer}-deploy'
git-revision: true
block: true
+ - trigger-builds:
- project: 'functest-opnfv-jump-2'
block: true
@@ -236,6 +240,8 @@
project-type: freestyle
+ disabled: true
+
node: opnfv-jump-2
logrotate:
@@ -445,9 +451,9 @@
/bin/cp -f $WORKSPACE/opnfv.properties $WORKSPACE/latest.properties
# upload artifact and additional files to google storage
- gsutil cp $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso
- gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties
- gsutil cp $WORKSPACE/latest.properties gs://$GS_URL/latest.properties
+ gsutil cp $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1
+ gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1
+ gsutil cp $WORKSPACE/latest.properties gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1
echo
echo "--------------------------------------------------------"