Merge "Disable APPC CSIT"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Tue, 6 Oct 2020 16:39:47 +0000 (16:39 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 6 Oct 2020 16:39:47 +0000 (16:39 +0000)
jjb/aai/aai-esr-gui.yaml [deleted file]
jjb/aai/aai-esr-server.yaml [deleted file]
jjb/cli/cli.yaml
jjb/global-templates-docker.yaml
jjb/global-templates-java.yaml
jjb/portal/portal-docker.yaml

diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
deleted file mode 100644 (file)
index ae853d5..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
----
-- project:
-    name: aai-esr-gui-project-view
-    project-name: aai-esr-gui
-    views:
-      - project-view
-
-- project:
-    name: aai-esr-gui
-    project-name: 'aai-esr-gui'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          mvn-params: '-f distribution/pom.xml -P docker docker:build -B -Dmaven.test.skip=true'
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'aai/esr-gui'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'aai-esr-gui-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: ubuntu1804-builder-4c-4g
-
-- project:
-    name: aai-esr-gui-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/esr-gui'
-    project-name: 'aai-esr-gui'
-    stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'aai-esr-gui-settings'
-
-- project:
-    name: aai-esr-gui-info
-    project-name: aai-esr-gui
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: aai/esr-gui
-    branch: master
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
deleted file mode 100644 (file)
index 1c8b961..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
----
-- project:
-    name: aai-esr-server-project-view
-    project-name: aai-esr-server
-    views:
-      - project-view
-
-- project:
-    name: aai-esr-server-master
-    project-name: 'aai-esr-server'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          mvn-params: '-f standalone/pom.xml -P docker docker:build -B -Dmaven.test.skip=true'
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'aai/esr-server'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'aai-esr-server-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: ubuntu1804-builder-4c-4g
-
-- project:
-    name: aai-esr-server-sonar
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
-    project: 'aai/esr-server'
-    project-name: 'aai-esr-server'
-    branch: 'master'
-    mvn-settings: 'aai-esr-server-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: aai-esr-server-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/esr-server'
-    project-name: 'aai-esr-server'
-    stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'aai-esr-server-settings'
-
-- project:
-    name: aai-esr-server-info
-    project-name: aai-esr-server
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: aai/esr-server
-    branch: master
index d45453f..3f182ec 100644 (file)
@@ -7,6 +7,7 @@
 
 - project:
     name: cli
+    java-version: openjdk11
     project-name: 'cli'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -26,7 +27,6 @@
           build-node: centos7-docker-8c-8g
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'deployment/docker/pom.xml'
-          java-version: openjdk11
           mvn-goals: 'docker:build'
           docker-image-name: 'onap/cli'
           build-node: ubuntu1804-docker-8c-8g
@@ -63,6 +63,7 @@
 #
 - project:
     name: cli-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     project: 'cli'
     project-name: 'cli'
     branch: 'master'
-    java-version: openjdk11
     mvn-settings: 'cli-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
     name: cli-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: 'cli'
     project-name: 'cli'
     branch: 'master'
-    java-version: openjdk11
     mvn-settings: 'cli-settings'
     build-node: ubuntu1804-builder-4c-4g
 
index eecedd4..8b243b6 100644 (file)
       # Provided all steps have already passed, push the docker image
       - shell: !include-raw: ../shell/docker-push.sh
 
-- job-template:
-    name: '{project-name}-{stream}-merge-docker-cascade-trigger'
-    # Job template for Docker merge jobs
-    #
-    # The purpose of this job template is to run a docker build, and potentially
-    # test validation of the docker image. This job is triggered by the it's corresponding
-    # job that builds the artifacts from which the docker image is built from. Projects
-    # using the {project-name}-{stream}-merge-docker job should move to this job. Because
-    # the {project-name}-{stream}-merge-docker has no garanties that the docker image is built
-    # from merged artifact.
-
-    <<: *docker_job_boiler_plate
-    # yamllint disable-line rule:key-duplicates
-    <<: *docker_merge_boiler_plate
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            BUILD_MODE=SNAPSHOT
-            DOCKERREGISTRY={docker_registry}
-      # Do the docker build
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-    triggers:
-      - reverse:
-          jobs:
-            - '{parent_job}'
-          result: 'success'
-
 - job-template:
     name: '{project-name}-{stream}-verify-docker'
     # Job template for Docker verify jobs
       # Execute any post build clean-up or testing
       - shell: '{post_build_script}'
 
-- job-template:
-    name: '{project-name}-{stream}-verify-docker-cascade-trigger'
-    # Job template for Docker verify jobs
-    #
-    # The purpose of this job template is to run a docker build, and potentially
-    # test validation of the docker image. This job is triggered by the it's corresponding
-    # job that builds the artifacts from which the docker image is built from. Projects
-    # using the {project-name}-{stream}-verify-docker job should move to this job. Because
-    # the {project-name}-{stream}-verify-docker has no garanties that the docker image is built
-    # from merged artifact.
-
-    ######################
-    # Default parameters #
-    ######################
-
-    <<: *docker_job_boiler_plate
-    # yamllint disable-line rule:key-duplicates
-    <<: *docker_verify_boiler_plate
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            BUILD_MODE=SNAPSHOT
-            DOCKERREGISTRY={docker_registry}
-      # Do the docker build
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-    triggers:
-      - reverse:
-          jobs:
-            - '{parent_job}'
-          result: 'success'
-
-- job-template:
-    name: '{project-name}-{stream}-release-version-docker-daily-no-sonar'
-    # Job template for Docker daily release jobs
-    #
-    # The purpose of this job template is to run "docker build and docker push"
-    # for projects using this template.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    <<: *docker_job_boiler_plate
-
-    docker_registry: '$DOCKER_REGISTRY:10003'
-
-    scm:
-      - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '$GIT_URL/$PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
-          submodule-disable: '{submodule-disable}'
-          choosing-strategy: default
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=STAGING
-
-      # Do the docker build
-      - shell: !include-raw: ../shell/snapshot-strip.sh
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-
-    triggers:
-      # 11 AM UTC
-      - timed: '@daily'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-- job-template:
-    name: '{project-name}-{stream}-release-version-docker-daily-no-sonar-cascade-trigger'
-    # Job template for Docker daily release job.
-    #
-    # The purpose of this job template is to run "docker build and docker push"
-    # for projects using this template. This job is triggered by the daily build
-    # that builds the artifacts required for building the Docker image.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    <<: *docker_job_boiler_plate
-
-    docker_registry: '$DOCKER_REGISTRY:10003'
-
-    scm:
-      - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '$GIT_URL/$PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
-          submodule-disable: '{submodule-disable}'
-          choosing-strategy: default
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=STAGING
-
-      # Do the docker build
-      - shell: !include-raw: ../shell/snapshot-strip.sh
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-
-    triggers:
-      - reverse:
-          jobs:
-            - '{parent_job}'
-          result: 'success'
-
-- job-template:
-    name: '{project-name}-{subproject}-{stream}-merge-docker'
-    # Job template for Docker merge jobs
-    #
-    # The purpose of this job template is to run a docker build, and potentially
-    # test validation of the docker image
-
-    <<: *docker_job_boiler_plate
-    # yamllint disable-line rule:key-duplicates
-    <<: *docker_merge_boiler_plate
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=SNAPSHOT
-      # Do the docker build
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-
-- job-template:
-    name: '{project-name}-{subproject}-{stream}-merge-docker-cascade-trigger'
-    # Job template for Docker merge jobs
-    #
-    # The purpose of this job template is to run a docker build, and potentially
-    # test validation of the docker image. This job is triggered by the merge job
-    # that builds the artifacts required for building the Docker image.
-
-    <<: *docker_job_boiler_plate
-    # yamllint disable-line rule:key-duplicates
-    <<: *docker_merge_boiler_plate
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=SNAPSHOT
-      # Do the docker build
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-    triggers:
-      - reverse:
-          jobs:
-            - '{parent_job}'
-          result: 'success'
-
-- job-template:
-    name: '{project-name}-{subproject}-{stream}-verify-docker'
-    # Job template for Docker verify jobs
-    #
-    # The purpose of this job template is to run a docker build, and potentially
-    # test validation of the docker image
-
-    ######################
-    # Default parameters #
-    ######################
-
-    <<: *docker_job_boiler_plate
-    # yamllint disable-line rule:key-duplicates
-    <<: *docker_verify_boiler_plate
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=SNAPSHOT
-      # Do the docker build
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-
-- job-template:
-    name: '{project-name}-{subproject}-{stream}-verify-docker-cascade-trigger'
-    # Job template for Docker verify jobs
-    #
-    # The purpose of this job template is to run a docker build, and potentially
-    # test validation of the docker image
-
-    ######################
-    # Default parameters #
-    ######################
-
-    <<: *docker_job_boiler_plate
-    # yamllint disable-line rule:key-duplicates
-    <<: *docker_verify_boiler_plate
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=SNAPSHOT
-      # Do the docker build
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-    triggers:
-      - reverse:
-          jobs:
-            - '{parent_job}'
-          result: 'success'
-
-- job-template:
-    name: '{project-name}-{subproject}-{stream}-release-version-docker-daily-no-sonar'
-    # Job template for Docker daily release jobs
-    #
-    # The purpose of this job template is to run "docker build and docker push"
-    # for projects using this template.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    <<: *docker_job_boiler_plate
-
-    docker_registry: '$DOCKER_REGISTRY:10003'
-
-    scm:
-      - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '$GIT_URL/$PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
-          submodule-disable: '{submodule-disable}'
-          choosing-strategy: default
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=STAGING
-
-      # Do the docker build
-      - shell: !include-raw: ../shell/snapshot-strip.sh
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-
-    triggers:
-      # 11 AM UTC
-      - timed: '@daily'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-- job-template:
-    name: '{project-name}-{subproject}-{stream}-release-version-docker-daily-no-sonar-cascade-trigger'
-    # Job template for Docker daily release jobs
-    #
-    # The purpose of this job template is to run "docker build and docker push"
-    # for projects using this template. This job is triggered by the daily job
-    # that builds the artifacts required for building the Docker image.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    <<: *docker_job_boiler_plate
-
-    docker_registry: '$DOCKER_REGISTRY:10003'
-
-    scm:
-      - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '$GIT_URL/$PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
-          submodule-disable: '{submodule-disable}'
-          choosing-strategy: default
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=STAGING
-
-      # Do the docker build
-      - shell: !include-raw: ../shell/snapshot-strip.sh
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-
-    triggers:
-      - reverse:
-          jobs:
-            - '{parent_job}'
-          result: 'success'
-
-- job-template:
-    name: '{project-name}-{subproject}-{stream}-release-version-docker-no-sonar'
-    # Job template for Docker final release job
-    #
-    # The purpose of this job template is to run "docker build and docker push"
-    # for projects using this template.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    <<: *docker_job_boiler_plate
-
-    docker_registry: '$DOCKER_REGISTRY:10003'
-
-    scm:
-      - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '$GIT_URL/$PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
-          submodule-disable: '{submodule-disable}'
-          choosing-strategy: default
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=STAGING
-
-      # Do the docker build
-      - shell: !include-raw: ../shell/snapshot-strip.sh
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-
-- job-template:
-    name: '{project-name}-{subproject}-{stream}-release-version-docker-cascade-trigger-no-sonar'
-    # Job template for Docker final release job
-    #
-    # The purpose of this job template is to run "docker build and docker push"
-    # for projects using this template. This job has no cascading counterpart, because the
-    # final release is moved manually to the release repo.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    <<: *docker_job_boiler_plate
-
-    docker_registry: '$DOCKER_REGISTRY:10003'
-
-    scm:
-      - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '$GIT_URL/$PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
-          submodule-disable: '{submodule-disable}'
-          choosing-strategy: default
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=STAGING
-
-      # Do the docker build
-      - shell: !include-raw: ../shell/snapshot-strip.sh
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-    triggers:
-      - reverse:
-          jobs:
-            - '{parent_job}'
-          result: 'success'
-
 - job-template:
     # Job template for creating a docker manifest list
     #
index 55df274..b55c6c8 100644 (file)
     node: '{build-node}'
     docker-image-name: ''
     disabled: '{disabled}'
+    java-version: 'openjdk8'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
index 04a6374..5fd3455 100644 (file)
@@ -17,8 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-3.2.0':
-          branch: 'release-3.2.0'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'portal-settings'
     files: '**'
     archive-artifacts: ''