summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/aaf/build-sshsm.sh15
-rw-r--r--jjb/vnfsdk/vnfsdk-pkgtools-python.yaml1
-rw-r--r--jjb/vnfsdk/vnfsdk-ves-agent.yaml2
3 files changed, 3 insertions, 15 deletions
diff --git a/jjb/aaf/build-sshsm.sh b/jjb/aaf/build-sshsm.sh
index e26d44bfd..f5702cf85 100644
--- a/jjb/aaf/build-sshsm.sh
+++ b/jjb/aaf/build-sshsm.sh
@@ -4,17 +4,6 @@
CURRENTDIR="$(pwd)"
echo $CURRENTDIR
-echo 'Building the SoftHSMv2...'
+echo 'Building AAF/sshsm project'
+sh build.sh
-cd SoftHSMv2
-sh autogen.sh
-./configure
-make check
-cd ..
-
-echo 'Building the TPM2-Plugin...'
-
-cd TPM2-Plugin
-./bootstrap
-./configure
-make
diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
index f13da8b17..2e1a7e6ac 100644
--- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
@@ -13,7 +13,6 @@
mvn-settings: 'vnfsdk-pkgtools-settings'
build-node: ubuntu1604-basebuild-4c-4g
jobs:
- - gerrit-maven-clm
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- project:
diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index 6c133f47b..a41e68df2 100644
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -8,7 +8,7 @@
pattern: 'veslibrary/**'
jobs:
- gerrit-maven-clm:
- pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
+ mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'