Replace ubuntu1604 with ubuntu1804

[ci-management.git] / jjb / validation / validation-docker.yaml

diff --git a/jjb/validation/validation-docker.yaml b/jjb/validation/validation-docker.yaml
index 481aa59..7a99536 100644 (file)
--- a/jjb/validation/validation-docker.yaml
+++ b/jjb/validation/validation-docker.yaml
@@ -1,3 +1,4 @@
+---
 - project:
 
     name: validation-docker
@@ -7,167 +8,36 @@
       - master:
           branch: '{stream}'
           disabled: false
+          triggers:
+            # Build nigtly at 12:10 AM
+            - timed: '10 0 * * *'
+      - 3.0.0:
+          branch: 'master'
+          disabled: false
+          triggers:
+            - gerrit:
+                server-name: '{gerrit-server-name}'
+                trigger-on:
+                  - change-merged-event
+                  - comment-added-contains-event:
+                      comment-contains-value: remerge$
+                projects:
+                  - project-compare-type: ANT
+                    project-pattern: 'ci-management'
+                    branches:
+                      - branch-compare-type: ANT
+                        branch-pattern: '**/master'
+                    file-paths:
+                      - compare-type: REG_EXP
+                        pattern: 'jjb/validation/validation-docker.yaml'
 
     arch_tag:
       - 'amd64':
-          slave_label: 'ubuntu1604-docker-8c-8g'
+          slave_label: 'ubuntu1804-docker-8c-8g'
       - 'arm64':
-          slave_label: 'aarch64_dev'
-
-    # settings for jobs run in multijob phases
-    docker-build-job-settings: &docker-build-job-settings
-      current-parameters: false
-      git-revision: true
-      node-parameters: false
-      predefined-parameters: |
-        GERRIT_REFNAME=$GERRIT_REFNAME
-      kill-phase-on: FAILURE
-      abort-all-jobs: false
+          slave_label: 'aarch64_build'
 
     jobs:
-      - "validation-{stream}-docker"
-      - "validation-docker-build-{arch_tag}-{stream}"
-      - "validation-docker-manifest-{stream}"
-
-########################
-# job templates
-########################
-- job-template:
-    name: 'validation-{stream}-docker'
-    project-type: multijob
-    disabled: '{obj:disabled}'
-    node: 'centos7-builder-2c-1g'
-    build-timeout: 90
-
-    parameters:
-      - validation-job-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          stream: '{stream}'
-
-    properties:
-      - throttle:
-          max-per-node: 1
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'validation-docker-.*'
-          blocking-level: 'NODE'
-    scm:
-      - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '{git-url}/{project}.git'
-          refspec: ''
-          branch: '{branch}'
-          submodule-recursive: false
-          submodule-timeout: '{submodule-timeout}'
-          submodule-disable: false
-          choosing-strategy: default
-
-    triggers:
-      # Build nigtly at 12:10 AM
-      - timed: '10 0 * * *'
-
-    builders:
-      - multijob:
-          name: 'build validation images'
-          execution-type: PARALLEL
-          projects:
-            - name: 'validation-docker-build-amd64-{stream}'
-              <<: *docker-build-job-settings
-            - name: 'validation-docker-build-arm64-{stream}'
-              <<: *docker-build-job-settings
-      - multijob:
-          name: 'publish validation manifests'
-          condition: SUCCESSFUL
-          execution-type: PARALLEL
-          projects:
-            - name: 'validation-docker-manifest-{stream}'
-              <<: *docker-build-job-settings
-
-    publishers:
-      - email:
-          recipients: 'cristina.pauna@enea.com'
-
-- job-template:
-    name: 'validation-docker-build-{arch_tag}-{stream}'
-    disabled: '{obj:disabled}'
-    node: '{slave_label}'
-    build-timeout: 75
-
-    parameters:
-      - validation-job-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          stream: '{stream}'
-          arch_tag: '{arch_tag}'
-
-    properties:
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'validation-docker-build-.*'
-          blocking-level: 'NODE'
-    scm:
-     - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '{git-url}/{project}.git'
-          refspec: ''
-          branch: '{branch}'
-          submodule-recursive: false
-          submodule-timeout: '{submodule-timeout}'
-          submodule-disable: false
-          choosing-strategy: default
-
-    builders:
-      - lf-infra-docker-login:
-          global-settings-file: global-settings
-          settings-file: '{mvn-settings}'
-      - shell: |
-          #!/bin/bash -ex
-          make -k -C docker push-all
-      - shell: |
-          #!/bin/bash -ex
-          docker system prune -af
-
-- job-template:
-    name: 'validation-docker-manifest-{stream}'
-    node: 'ubuntu1604-docker-8c-8g'
-    build-timeout: 15
-
-    parameters:
-      - validation-job-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          stream: '{stream}'
-
-    disabled: '{obj:disabled}'
-
-    scm:
-     - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '{git-url}/{project}.git'
-          refspec: ''
-          branch: '{branch}'
-          submodule-recursive: false
-          submodule-timeout: '{submodule-timeout}'
-          submodule-disable: false
-          choosing-strategy: default
-
-    builders:
-      - lf-infra-docker-login:
-          global-settings-file: global-settings
-          settings-file: '{mvn-settings}'
-      - shell: |
-          #!/bin/bash -ex
-          for sd in docker/*/.; do make -k -C $sd .push_manifest; done
-
-# parameter macro
-- parameter:
-    name: validation-job-parameters
-    parameters:
-      - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
+      - akraino-validation-docker-multiarch
+      - akraino-validation-docker-specific-arch
+      - akraino-validation-docker-manifest