X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-templates-docker.yaml;h=23a554ba96e936e72ac9ed15adc95a03b8151f0a;hb=92898a639e9d19851c419eab5593df9da2fa8ec7;hp=8650086e676fb96cf0845c24c4a60e4e26e461b3;hpb=f801ba055536d4b9c3c1a674661a74ced5a169bf;p=ci-management.git diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml index 8650086e6..23a554ba9 100644 --- a/jjb/global-templates-docker.yaml +++ b/jjb/global-templates-docker.yaml @@ -24,6 +24,8 @@ # Default to LF standard 'snapshots' docker registry docker_registry: '$DOCKER_REGISTRY:10003' docker_tag: 'latest' + submodule-disable: false + submodule-timeout: 10 ##################### # Job Configuration # @@ -65,6 +67,7 @@ server: '{server-name}' project: '{project}' branch: '{branch}' + files: '{files}' - docker_merge_boiler_plate: &docker_merge_boiler_plate name: docker_merge_boiler_plate @@ -80,7 +83,7 @@ server: '{server-name}' project: '{project}' branch: '{branch}' - files: '**' + files: '{files}' - pollscm: cron: '' @@ -99,6 +102,7 @@ <<: *docker_merge_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -111,6 +115,7 @@ 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 @@ -138,6 +143,7 @@ <<: *docker_verify_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -150,6 +156,7 @@ 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 @@ -160,17 +167,27 @@ - shell: '{post_build_script}' - job-template: - name: '{project-name}-{stream}-release-version-docker-daily-no-sonar' - # Job template for Docker daily release jobs + # Job template for creating a docker manifest list # - # 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) + # The purpose of this job template is to run: + # 1. docker_push_manifest.sh script (which needs to exist in the + # project implementation repo) + + name: '{project-name}-docker-manifest-{stream}' <<: *docker_job_boiler_plate + node: '{build-node}' + build-timeout: 15 + + parameters: + - lf-infra-parameters: + project: '{project}' + stream: '{stream}' + branch: '{branch}' + - string: + name: PARENT_JOB_NAME + default: 'none' - docker_registry: '$DOCKER_REGISTRY:10004' + disabled: '{obj:disabled}' scm: - lf-infra-gerrit-scm: @@ -179,126 +196,58 @@ refspec: '$GERRIT_REFSPEC' branch: '$GERRIT_BRANCH' submodule-recursive: true + submodule-disable: '{submodule-disable}' + submodule-timeout: '{submodule-timeout}' choosing-strategy: default - builders: - - 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} - - # 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: 'H 11 * * *' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - -- 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-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} - # 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 + - shell: | + #!/bin/bash -ex + export PARENT_JOB_NAME + ./docker_push_manifest.sh - job-template: - name: '{project-name}-{subproject}-{stream}-verify-docker' - # Job template for Docker verify jobs + # Job template for staging jobs on multiple architectures # - # The purpose of this job template is to run a docker build, and potentially - # test validation of the docker image + # The purpose of this job template is to: + # 1. Run parallel maven-docker-stage jobs for each supported architecure + # 2. Build and push a docker manifest list for the images created by + # the previous jobs - ###################### - # Default parameters # - ###################### - - <<: *docker_job_boiler_plate - # yamllint disable-line rule:key-duplicates - <<: *docker_verify_boiler_plate + name: '{project-name}-multiarch-docker-stage-{stream}' + node: '{build-node}' + project-type: multijob + disabled: '{obj:disabled}' + build-timeout: 15 + pattern: '**' - builders: - - 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} - # 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}' + parameters: + - lf-infra-parameters: + project: '{project}' + stream: '{stream}' + branch: '{branch}' + - string: + name: DOCKER_REGISTRY + default: 'none' + - string: + name: DOCKERHUB_REGISTRY + default: 'registry-1.docker.io' -- 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 + disabled: '{obj:disabled}' - docker_registry: '$DOCKER_REGISTRY:10004' + properties: + - throttle: + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - '{project-name}-.*-docker-.*' + blocking-level: 'NODE' scm: - lf-infra-gerrit-scm: @@ -307,38 +256,50 @@ refspec: '$GERRIT_REFSPEC' branch: '$GERRIT_BRANCH' submodule-recursive: true + submodule-timeout: 10 + submodule-disable: false choosing-strategy: default - builders: - - 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} + triggers: + - timed: '@daily' + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: + - comment-added-contains-event: + comment-contains-value: '^Patch Set\s+\d+:\s+stage-(docker-)?release\s*$' + + projects: + - project-compare-type: ANT + project-pattern: '{project}' + branches: + - branch-compare-type: ANT + branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: "**" - # 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 + builders: + - multijob: + name: 'build docker images' + condition: ALWAYS + execution-type: PARALLEL + projects: + - name: '{project-name}-amd64-maven-docker-stage-{stream}' + kill-phase-on: FAILURE + current-parameters: true + - name: '{project-name}-arm64-maven-docker-stage-{stream}' + kill-phase-on: NEVER + current-parameters: true + - multijob: + name: 'publish docker manifest' + condition: SUCCESSFUL + execution-type: PARALLEL + projects: + - name: '{project-name}-docker-manifest-{stream}' + current-parameters: true + predefined-parameters: | + PARENT_JOB_NAME=$JOB_NAME + DOCKERHUB_REGISTRY=docker.io - triggers: - # 11 AM UTC - - timed: 'H 11 * * *' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' + publishers: + - lf-infra-publish