diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/clamp/clamp.yaml | 2 | ||||
| -rw-r--r-- | jjb/logging-analytics/logging-analytics.yaml | 4 | ||||
| -rw-r--r-- | jjb/policy/policy-api.yaml | 32 | ||||
| -rw-r--r-- | jjb/policy/policy-gui.yaml | 31 | ||||
| -rw-r--r-- | jjb/policy/policy-pap.yaml | 31 | ||||
| -rw-r--r-- | jjb/policy/policy-pdp.yaml | 31 | ||||
| -rwxr-xr-x | jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh | 4 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-sfc.yaml | 1 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml | 6 | ||||
| -rw-r--r-- | jjb/vid/vid-asdcclient.yaml | 30 | ||||
| -rw-r--r-- | jjb/vid/vid.yaml | 2 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-compliance-csit.yaml | 14 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-compliance.yaml | 42 |
13 files changed, 7 insertions, 223 deletions
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index b2c6ebe50..583540684 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -30,8 +30,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'clamp-settings' files: '**' archive-artifacts: '' diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 3ebc1d817..f5c1f589c 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -18,8 +18,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'logging-analytics-settings' files: '**' archive-artifacts: '' @@ -34,4 +32,4 @@ branch: 'master' mvn-settings: 'logging-analytics-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml deleted file mode 100644 index b9deabc19..000000000 --- a/jjb/policy/policy-api.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- project: - name: policy-api - project-name: 'policy-api' - jobs: - - gerrit-maven-clm: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - - project: 'policy/api' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-api-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g -- project: - name: policy-api-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - project: 'policy/api' - project-name: 'policy-api' - branch: 'master' - mvn-settings: 'policy-api-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml deleted file mode 100644 index 3505fedc7..000000000 --- a/jjb/policy/policy-gui.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- project: - name: policy-gui - project-name: 'policy-gui' - jobs: - - gerrit-maven-clm: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - - project: 'policy/gui' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-gui-settings' - files: '**' - archive-artifacts: '' -- project: - name: policy-gui-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - project: 'policy/gui' - project-name: 'policy-gui' - branch: 'master' - mvn-settings: 'policy-gui-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml deleted file mode 100644 index eb8bd03aa..000000000 --- a/jjb/policy/policy-pap.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- project: - name: policy-pap - project-name: 'policy-pap' - jobs: - - gerrit-maven-clm: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - - project: 'policy/pap' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-pap-settings' - files: '**' - archive-artifacts: '' -- project: - name: policy-pap-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - project: 'policy/pap' - project-name: 'policy-pap' - branch: 'master' - mvn-settings: 'policy-pap-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml deleted file mode 100644 index 58a497eac..000000000 --- a/jjb/policy/policy-pdp.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- project: - name: policy-pdp - project-name: 'policy-pdp' - jobs: - - gerrit-maven-clm: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - - project: 'policy/pdp' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-pdp-settings' - files: '**' - archive-artifacts: '' -- project: - name: policy-pdp-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - project: 'policy/pdp' - project-name: 'policy-pdp' - branch: 'master' - mvn-settings: 'policy-pdp-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh index 2f33312c0..eb7961ed4 100755 --- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh +++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh @@ -11,6 +11,6 @@ chmod 755 ./zte/vmanager/docker/*.* chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.* ./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh -cd nokia/deployment -mvn package -Dexec.args="buildDocker pushImage" +chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.* +./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml index 47d3210bc..bb1bd6b6b 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml @@ -30,6 +30,7 @@ name: vfc-nfvo-driver-sfc-sonar jobs: - gerrit-maven-sonar + mvn-params: '-f zte/sfc-driver/pom.xml' build-node: ubuntu1604-basebuild-4c-4g project: 'vfc/nfvo/driver/sfc' project-name: 'vfc-nfvo-driver-sfc' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml index 42ed55ce8..c08037344 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml @@ -11,8 +11,8 @@ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' subproject: - 'drv-vnfm-nokia': - pom: 'nokia/pom.xml' - pattern: 'nokia/**' + pom: 'nokia/vnfmdirver/pom.xml' + pattern: 'nokia/vnfmdriver/**' jobs: - gerrit-maven-clm: - '{project-name}-{stream}-{subproject}-verify-java' @@ -25,7 +25,7 @@ name: vfc-nfvo-driver-vnfm-svnfm-nokia-sonar jobs: - gerrit-maven-sonar - mvn-params: '-f nokia/pom.xml' + mvn-params: '-f nokia/vnfmdriver/pom.xml' build-node: ubuntu1604-basebuild-4c-4g project: 'vfc/nfvo/driver/vnfm/svnfm' project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokia' diff --git a/jjb/vid/vid-asdcclient.yaml b/jjb/vid/vid-asdcclient.yaml deleted file mode 100644 index ae1da552d..000000000 --- a/jjb/vid/vid-asdcclient.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -- project: - name: vid-asdcclient - project-name: 'vid-asdcclient' - jobs: - - gerrit-maven-clm: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - project: 'vid/asdcclient' - stream: - - 'master': - branch: 'master' - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'vid-settings' - files: '**' - archive-artifacts: '' -- project: - name: vid-asdcclient-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - project: 'vid/asdcclient' - project-name: 'vid-asdcclient' - branch: 'master' - mvn-settings: 'vid-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 9ae347912..e3f588c03 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -19,8 +19,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'vid-settings' files: '**' archive-artifacts: '' diff --git a/jjb/vnfsdk/vnfsdk-compliance-csit.yaml b/jjb/vnfsdk/vnfsdk-compliance-csit.yaml deleted file mode 100644 index 6ed6fef66..000000000 --- a/jjb/vnfsdk/vnfsdk-compliance-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: vnfsdk-compliance-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vnfsdk-compliance' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: - - '{project-name}-{stream}-merge-java' - robot-options: '' - branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-compliance.yaml b/jjb/vnfsdk/vnfsdk-compliance.yaml deleted file mode 100644 index 0041dda6c..000000000 --- a/jjb/vnfsdk/vnfsdk-compliance.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -- project: - name: vnfsdk-compliance - project-name: 'vnfsdk-compliance' - jobs: - - gerrit-maven-clm: - mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - mvn-goals: 'docker:build' - docker-image-name: 'onap/compliance' - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - mvn-profile: 'docker' - - project: 'vnfsdk/compliance' - subproject: - - 'veslibrary': - pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - pattern: 'veslibrary/**' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vnfsdk-compliance-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g -- project: - name: vnfsdk-compliance-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - project: 'vnfsdk/compliance' - project-name: 'vnfsdk-compliance' - branch: 'master' - mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - mvn-settings: 'vnfsdk-compliance-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' |