Merge "[VVP] vvp ci jobs docker"

diff --git a/jjb/aaf/build-aaf-docker-image.sh b/jjb/aaf/build-aaf-docker-image.sh
index 17168ae..2c713c9 100644 (file)
--- a/jjb/aaf/build-aaf-docker-image.sh
+++ b/jjb/aaf/build-aaf-docker-image.sh
@@ -4,4 +4,5 @@ ls -ltr
 cd auth/docker/
 ls -ltr
 chmod 755 *
-./dbuild
\ No newline at end of file
+sh dbuild.sh
+sh dpush.sh
\ No newline at end of file

diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index 81b55b4..c3f9edc 100644 (file)
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -8,9 +8,9 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-verify-docker'
-      - '{project-name}-{stream}-merge-docker'
-      - '{project-name}-{stream}-release-version-docker-daily-no-sonar'
+      - '{project-name}-{stream}-docker-java-daily'
+      - '{project-name}-{stream}-docker-version-java-daily'
+      - '{project-name}-docker-image-blessing'
 
     project: 'appc/deployment'
     stream:

diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index 3841b88..a79ad44 100644 (file)
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -5,7 +5,8 @@
     project-name: 'clamp'
     jobs:
       - gerrit-maven-clm:
-      - '{project-name}-{stream}-verify-java-checkstyle'
+      - '{project-name}-{stream}-verify-java-checkstyle':
+         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
       - '{project-name}-{stream}-merge-properties-java':
          mvn_properties:
             - docker.pull.registry=nexus3.onap.org:10001
@@ -37,7 +38,8 @@
 - project:
     name: clamp-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar:
+          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
     cron: 'H 11 * * *'
     build-node: ubuntu1604-docker-8c-8g
     project: 'clamp'

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 2c4e1fe..a984574 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -155,6 +155,8 @@
           artifacts: '{archive-artifacts}'
       - maven-exec:
           maven-version: '{maven-version}'
+      - maven-params:
+          mvn-params: '{mvn-params}'
     scm:
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
@@ -176,7 +178,7 @@
       - maven-target:
           maven-version: '{maven-version}'
           goals: 'clean install -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'

diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index acd5e17..966ecb3 100644 (file)
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -70,71 +70,6 @@
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
-- job-template:
-    # Job template for docker daily jobs
-    #
-    # The purpose of this job template is to run:
-    # 1. login into the docker registry
-    # 2. docker build
-    # 3. docker tag
-    # 4. docker push
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    name: '{project-name}-{stream}-docker-shell-daily'
-    project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 12 AM UTC
-      - timed: 'H 12 * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - docker-login
-
-      - shell: |
-          cp $WORKSPACE/docker/* .
-          docker -D build -t openecomp/testsuite .
-          export REPO="nexus3.onap.org:10003"
-          docker tag openecomp/testsuite:latest $REPO/openecomp/testsuite:1.0-STAGING-latest
-          docker push $REPO/openecomp/testsuite:1.0-STAGING-latest
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
 - job-template:
     # Job template for docker daily jobs for 2 SCMs
     #

diff --git a/jjb/testsuite/testsuite-docker.sh b/jjb/testsuite/testsuite-docker.sh
index 33eea4f..d29d43c 100644 (file)
--- a/jjb/testsuite/testsuite-docker.sh
+++ b/jjb/testsuite/testsuite-docker.sh
@@ -2,10 +2,10 @@
 #
 echo '============== CALLING SCRIPT TO CREATE DOCKER IMAGES ================='
 cp $WORKSPACE/docker/* .
-docker -D build -t openecomp/testsuite .
+docker -D build -t onap/testsuite .
 export REPO="nexus3.onap.org:10003"
 for tag in $tags
 do
-  docker tag openecomp/testsuite:latest $REPO/openecomp/testsuite:$tag
-  docker push $REPO/openecomp/testsuite:$tag
+  docker tag onap/testsuite:latest $REPO/onap/testsuite:$tag
+  docker push $REPO/onap/testsuite:$tag
 done

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
index d3ae91f..b8ba2d6 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
@@ -10,7 +10,8 @@
     mvn-profile: rootOnly
     jobs:
       - '{project-name}-{stream}-verify-profile-java'
-      - '{project-name}-{stream}-merge-profile-java'
+      - '{project-name}-{stream}-merge-profile-java':
+            build-node: ubuntu1604-docker-8c-8g
       - '{project-name}-{stream}-release-version-profile-java-daily'
     files: 'pom.xml'
     archive-artifacts: ''