summaryrefslogtreecommitdiffstats
path: root/jjb/functest
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/functest')
-rw-r--r--jjb/functest/functest-docker.yml9
-rwxr-xr-xjjb/functest/functest-env-presetup.sh6
-rw-r--r--jjb/functest/functest-kubernetes-project-jobs.yml4
-rw-r--r--jjb/functest/functest-project-jobs.yml4
4 files changed, 15 insertions, 8 deletions
diff --git a/jjb/functest/functest-docker.yml b/jjb/functest/functest-docker.yml
index 909c7b079..50c7c3816 100644
--- a/jjb/functest/functest-docker.yml
+++ b/jjb/functest/functest-docker.yml
@@ -12,7 +12,7 @@
- master:
branch: '{stream}'
disabled: false
- - euphrates:
+ - fraser:
branch: 'stable/{stream}'
disabled: false
@@ -31,7 +31,6 @@
- 'parser'
- 'smoke'
- 'vnf'
- - 'restapi'
# settings for jobs run in multijob phases
build-job-settings: &build-job-settings
@@ -136,10 +135,6 @@
<<: *build-job-settings
- name: 'functest-vnf-docker-build-arm64-{stream}'
<<: *build-job-settings
- - name: 'functest-restapi-docker-build-amd64-{stream}'
- <<: *build-job-settings
- - name: 'functest-restapi-docker-build-arm64-{stream}'
- <<: *build-job-settings
- multijob:
name: 'publish all manifests'
condition: SUCCESSFUL
@@ -157,8 +152,6 @@
<<: *manifest-job-settings
- name: 'functest-vnf-docker-manifest-{stream}'
<<: *manifest-job-settings
- - name: 'functest-restapi-docker-manifest-{stream}'
- <<: *manifest-job-settings
publishers:
- 'functest-amd64-recipients'
diff --git a/jjb/functest/functest-env-presetup.sh b/jjb/functest/functest-env-presetup.sh
index b7d33e760..323b325b4 100755
--- a/jjb/functest/functest-env-presetup.sh
+++ b/jjb/functest/functest-env-presetup.sh
@@ -45,5 +45,11 @@ elif [[ ${INSTALLER_TYPE} == 'daisy' ]]; then
echo "No available installer VM exists...exiting"
exit 1
fi
+
+elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then
+ if [[ ! "${BRANCH}" =~ "danube" ]]; then
+ echo "Map mcp ssh_key"
+ export sshkey_vol="-v ${SSH_KEY:-/var/lib/opnfv/mcp.rsa}:/root/.ssh/id_rsa"
+ fi
fi
diff --git a/jjb/functest/functest-kubernetes-project-jobs.yml b/jjb/functest/functest-kubernetes-project-jobs.yml
index 3eba5d177..55999060a 100644
--- a/jjb/functest/functest-kubernetes-project-jobs.yml
+++ b/jjb/functest/functest-kubernetes-project-jobs.yml
@@ -18,6 +18,10 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
+ - fraser:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
- euphrates:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml
index e068a4fee..b3ab3ca37 100644
--- a/jjb/functest/functest-project-jobs.yml
+++ b/jjb/functest/functest-project-jobs.yml
@@ -18,6 +18,10 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
+ - fraser:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
- euphrates:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'