AGL-repo: build only on default.xml changes.sandbox/jsmoeller/AGLrepo

Avoid rebuilds.

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: Ib6843b8f5ec929be54a5b1dcb6e322a382ce53d9

3 files changed, 869 insertions, 5 deletions

diff --git a/jjb/ci-AGL-verify/ci-platform-AGL-repo-other-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-AGL-repo-other-jjb.yaml
new file mode 100644
index 00000000..076274ee
--- /dev/null
+++ b/jjb/ci-AGL-verify/ci-platform-AGL-repo-other-jjb.yaml
@@ -0,0 +1,672 @@
+---
+- project:
+    name: ci-platform-AGL-repo-2
+    machine:
+      - bbe
+      - h3ulcb-nogfx
+      - qemux86-64
+      - qemuarm
+      - qemuarm64
+      - raspberrypi4
+    jobs:
+      # - ci-platform-AGL-repo-verify-CIB-start             #unused
+      - ci-platform-AGL-repo-verify-CIB-{machine}
+      - ci-platform-AGL-repo-verify-CIB-html5-qemux86-64
+      - ci-platform-AGL-repo-verify-CIB-aglcompositor-qemux86-64
+      - ci-platform-AGL-repo-verify-CIB-finish-success
+      - ci-platform-AGL-repo-verify-failure
+      # - ci-platform-AGL-repo-verify-CIBT-start            #unused
+      - ci-platform-AGL-repo-verify-CIBT-{machine}
+      - ci-platform-AGL-repo-verify-CIBT-complete
+      - ci-platform-AGL-repo-verify-CIBT-finish-success
+      - ci-platform-AGL-repo-remove-artifacts
+    description: "Managed by JJB. Do not Edit. \
+                  <br>Build time graph:<br><img src='buildTimeGraph/png' />"
+
+
+################################################################################################################################################################
+################################################################################################################################################################
+
+################################################################################
+################################################################################
+# -verify-CIB-start  = start message (message back to gerrit)
+################################################################################
+- job-template:
+    name: 'ci-platform-AGL-repo-verify-CIB-start'
+    project-type: freestyle
+    concurrent: true
+    node: control-slave
+    description: "Managed by JJB. Do not Edit. \
+                  <br>Build time graph:<br><img src='buildTimeGraph/png' />"
+    parameters:
+      - string:
+          name: GERRIT_PROJECT
+          default: 'AGL/AGL-repo'
+          description: "Project to build"
+      - string:
+          name: GERRIT_BRANCH
+          default: master
+          description: "branch to build"
+      - string:
+          name: GERRIT_REFSPEC
+          default: refs/heads/master
+          description: "refspec to build"
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: "8313"
+          description: "change # to build"
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: "2"
+          description: "patchset # to build"
+    build-discarder:
+      days-to-keep: 30
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+      - openstack:
+          single-use: false
+    builders:
+      - shell: |
+          #set
+          export TRIGGERURL=$(echo ${{BUILD_URL}} | sed -e 's,-CIB-start.*,,')
+          # ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 --label ci-image-build=0 --label ci-image-boot-test=0 -n NONE --message="CI-Image-Build\ started.\ URL:\ ${{BUILD_URL}}" || true
+          ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 -n NONE --message="CI-Image-Build\ started.\ URL:\ \$TRIGGERURL" || true
+
+
+################################################################################
+################################################################################
+# -verify-CIB-{machine}  = build for machine
+################################################################################
+- job-template:
+    name: 'ci-platform-AGL-repo-verify-CIB-{machine}'
+    project-type: freestyle
+    concurrent: true
+    node: agl-test-slave
+    description: "Managed by JJB. Do not Edit. \
+                  <br>Build time graph:<br><img src='buildTimeGraph/png' />"
+    parameters:
+      - string:
+          name: GERRIT_PROJECT
+          default: 'AGL/AGL-repo'
+          description: "Project to build"
+      - string:
+          name: GERRIT_BRANCH
+          default: master
+          description: "branch to build"
+      - string:
+          name: GERRIT_REFSPEC
+          default: refs/heads/master
+          description: "refspec to build"
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: "8313"
+          description: "change # to build"
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: "2"
+          description: "patchset # to build"
+      - string:
+          name: MACHINE
+          default: '{machine}'
+          description: "Machine to build"
+    build-discarder:
+      days-to-keep: 30
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+      - openstack:
+          single-use: true
+    builders:
+      - shell:
+          !include-raw-escape:
+          - ../common/include-agl-header.sh
+          - ../common/include-agl-repo.sh
+          - ../common/include-agl-select.sh
+          - ../common/include-agl-source-aglsetup.sh
+          - ../common/include-agl-auto-conf.sh
+          - ../common/include-agl-limit-parallelism.sh
+          - ../common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh
+          - ../common/include-agl-cat-auto-conf.sh
+          - include-release-eel-fix-task-depends.sh
+          - ../common/include-agl-bitbake-image.sh
+          - ../common/include-agl-run-test-prepare.sh
+          - ../common/include-agl-run-test-rsync-changeid.sh
+      - conditional-step:
+          condition-kind: always
+          steps:
+            - shell:
+                !include-raw-escape:
+                - ../common/include-agl-get-cost.sh
+
+#    publishers:
+#      - naginator:
+#          rerun-unstable-builds: true
+#          progressive-delay-increment: 5
+#          progressive-delay-maximum: 15
+#          max-failed-builds: 2
+#          #regular-expression: "Unexpected termination of the channel"
+
+
+################################################################################
+################################################################################
+# html5-verify-CIB-{machine}  = build for machine
+################################################################################
+- job-template:
+    name: 'ci-platform-AGL-repo-verify-CIB-html5-qemux86-64'
+    project-type: freestyle
+    concurrent: true
+    node: agl-test-slave
+    description: "Managed by JJB. Do not Edit. \
+                  <br>Build time graph:<br><img src='buildTimeGraph/png' />"
+    parameters:
+      - string:
+          name: GERRIT_PROJECT
+          default: 'AGL/AGL-repo'
+          description: "Project to build"
+      - string:
+          name: GERRIT_BRANCH
+          default: master
+          description: "branch to build"
+      - string:
+          name: GERRIT_REFSPEC
+          default: refs/heads/master
+          description: "refspec to build"
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: "8313"
+          description: "change # to build"
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: "2"
+          description: "patchset # to build"
+      - string:
+          name: MACHINE
+          default: 'qemux86-64'
+          description: "Machine to build"
+    build-discarder:
+      days-to-keep: 30
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+      - openstack:
+          single-use: true
+    builders:
+      - shell:
+          !include-raw-escape:
+          - ../common/include-agl-header.sh
+          - ../common/include-agl-repo.sh
+          - ../common/include-agl-select.sh
+          - ../common/include-agl-set-html5-image.sh
+          - ../common/include-agl-source-aglsetup.sh
+          - ../common/include-agl-auto-conf.sh
+          - ../common/include-agl-limit-parallelism.sh
+          - ../common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh
+          - ../common/include-agl-cat-auto-conf.sh
+          - ../common/include-agl-bitbake-image.sh
+      - conditional-step:
+          condition-kind: always
+          steps:
+            - shell:
+                !include-raw-escape:
+                - ../common/include-agl-get-cost.sh
+
+################################################################################
+################################################################################
+# html5-verify-CIB-{machine}  = build for machine
+################################################################################
+- job-template:
+    name: 'ci-platform-AGL-repo-verify-CIB-aglcompositor-qemux86-64'
+    project-type: freestyle
+    concurrent: true
+    node: agl-test-slave
+    description: "Managed by JJB. Do not Edit. \
+                  <br>Build time graph:<br><img src='buildTimeGraph/png' />"
+    parameters:
+      - string:
+          name: GERRIT_PROJECT
+          default: 'AGL/AGL-repo'
+          description: "Project to build"
+      - string:
+          name: GERRIT_BRANCH
+          default: master
+          description: "branch to build"
+      - string:
+          name: GERRIT_REFSPEC
+          default: refs/heads/master
+          description: "refspec to build"
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: "8313"
+          description: "change # to build"
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: "2"
+          description: "patchset # to build"
+      - string:
+          name: MACHINE
+          default: 'qemux86-64'
+          description: "Machine to build"
+    build-discarder:
+      days-to-keep: 30
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+      - openstack:
+          single-use: true
+    builders:
+      - shell:
+          !include-raw-escape:
+          - ../common/include-agl-header.sh
+          - ../common/include-agl-repo.sh
+          - ../common/include-agl-select.sh
+          - ../common/include-agl-set-compositor-image.sh
+          - ../common/include-agl-source-aglsetup.sh
+          - ../common/include-agl-auto-conf.sh
+          - ../common/include-agl-limit-parallelism.sh
+          - ../common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh
+          - ../common/include-agl-cat-auto-conf.sh
+          - ../common/include-agl-bitbake-image.sh
+      - conditional-step:
+          condition-kind: always
+          steps:
+            - shell:
+                !include-raw-escape:
+                - ../common/include-agl-get-cost.sh
+
+
+
+################################################################################
+################################################################################
+# -verify-CIB-finish-success = build succeeded, message to gerrit
+################################################################################
+- job-template:
+    name: 'ci-platform-AGL-repo-verify-CIB-finish-success'
+    project-type: freestyle
+    concurrent: true
+    node: control-slave
+    description: "Managed by JJB. Do not Edit. \
+                  <br>Build time graph:<br><img src='buildTimeGraph/png' />"
+    parameters:
+      - string:
+          name: GERRIT_PROJECT
+          default: 'AGL/AGL-repo'
+          description: "Project to build"
+      - string:
+          name: GERRIT_BRANCH
+          default: master
+          description: "branch to build"
+      - string:
+          name: GERRIT_REFSPEC
+          default: refs/heads/master
+          description: "refspec to build"
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: "8313"
+          description: "change # to build"
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: "2"
+          description: "patchset # to build"
+    build-discarder:
+      days-to-keep: 30
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+    builders:
+      - shell: |
+          set
+          echo "#### CIB +1 #### Verified +1 ####"
+          ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 -n NONE --message="CI-Image-Build\ finished,\ CIB+1,\ Verified+1" || true
+
+
+################################################################################
+################################################################################
+# -verify-failure = CI check failed, -1 message to gerrit
+################################################################################
+- job-template:
+    name: 'ci-platform-AGL-repo-verify-failure'
+    project-type: freestyle
+    concurrent: true
+    node: control-slave
+    description: "Managed by JJB. Do not Edit. \
+                  <br>Build time graph:<br><img src='buildTimeGraph/png' />"
+    parameters:
+      - string:
+          name: GERRIT_PROJECT
+          default: 'AGL/AGL-repo'
+          description: "Project to build"
+      - string:
+          name: GERRIT_BRANCH
+          default: master
+          description: "branch to build"
+      - string:
+          name: GERRIT_REFSPEC
+          default: refs/heads/master
+          description: "refspec to build"
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: "8313"
+          description: "change # to build"
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: "2"
+          description: "patchset # to build"
+    build-discarder:
+      days-to-keep: 30
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+    builders:
+      - shell: |
+          set
+          echo "#### Verified -1 ####"
+          #ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified -1 -n NONE --message="CI-cycle\ failed.\ URL:\ ${{BUILD_URL}}" || true
+          ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified -1 -n NONE --message="CI-cycle\ failed.\ URL:\ ${{ORIG_BUILD_URL}}" || true
+
+
+################################################################################################################################################################
+################################################################################################################################################################
+
+################################################################################
+################################################################################
+# -verify-CIBT-start = CI BOOT TEST start
+################################################################################
+- job-template:
+    name: 'ci-platform-AGL-repo-verify-CIBT-start'
+    project-type: freestyle
+    concurrent: true
+    node: control-slave
+    description: "Managed by JJB. Do not Edit. \
+                  <br>Build time graph:<br><img src='buildTimeGraph/png' />"
+    parameters:
+      - string:
+          name: GERRIT_PROJECT
+          default: 'AGL/AGL-repo'
+          description: "Project to build"
+      - string:
+          name: GERRIT_BRANCH
+          default: master
+          description: "branch to build"
+      - string:
+          name: GERRIT_REFSPEC
+          default: refs/heads/master
+          description: "refspec to build"
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: "8313"
+          description: "change # to build"
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: "2"
+          description: "patchset # to build"
+    build-discarder:
+      days-to-keep: 30
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+      - openstack:
+          single-use: false
+    builders:
+      - shell: |
+          echo "CIBT Started"
+          # set
+          # ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --label ci-image-boot-test=0 -n NONE --message='CI-Image-Boot-Test\ started' || true
+
+
+################################################################################
+################################################################################
+# -verify-CIBT-{machine} = CI BOOT TEST on machine
+################################################################################
+- job-template:
+    name: 'ci-platform-AGL-repo-verify-CIBT-{machine}'
+    project-type: freestyle
+    concurrent: true
+    node: hwtest-slave
+    description: "Managed by JJB. Do not Edit. \
+                  <br>Build time graph:<br><img src='buildTimeGraph/png' />"
+    parameters:
+      - string:
+          name: GERRIT_PROJECT
+          default: 'AGL/AGL-repo'
+          description: "Project to build"
+      - string:
+          name: GERRIT_BRANCH
+          default: master
+          description: "branch to build"
+      - string:
+          name: GERRIT_REFSPEC
+          default: refs/heads/master
+          description: "refspec to build"
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: "8313"
+          description: "change # to build"
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: "2"
+          description: "patchset # to build"
+      - string:
+          name: MACHINE
+          default: '{machine}'
+          description: "Machine to build"
+    build-discarder:
+      days-to-keep: 30
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+      - openstack:
+          single-use: false
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: agl_main_lava_instance
+              username: AGLLAVAUSER
+              password: AGLLAVATOKEN
+          - username-password-separated:
+              credential-id: agl_main_lava_instance
+              username: LAB_AGL_USER
+              password: LAB_AGL_TOKEN
+          - username-password-separated:
+              credential-id: lab_baylibre_lava_instance
+              username: LAB_BAYLIBRE_USER
+              password: LAB_BAYLIBRE_TOKEN
+          - username-password-separated:
+              credential-id: lab_baylibre_seattle_lava_instance
+              username: LAB_BAYLIBRE_SEATTLE_USER
+              password: LAB_BAYLIBRE_SEATTLE_TOKEN
+          - text:
+              credential-id: KCI_EMAIL_AUTH_TOKEN
+              variable: KCI_EMAIL_AUTH_TOKEN
+    builders:
+      - shell:
+          !include-raw-escape:
+          - ../common/include-agl-header.sh
+          - ../common/include-agl-repo.sh
+          - ../common/include-agl-select.sh
+          - ../common/include-agl-run-test-prepare.sh
+          - ../common/include-agl-lava-labs-prepare.sh
+          - ../common/include-agl-run-test-short.sh
+          - ../common/include-agl-lava-jobs-submit.sh
+      - conditional-step:
+          condition-kind: always
+          steps:
+              - shell:
+                  !include-raw-escape:
+                  - ../common/include-agl-get-cost.sh
+
+#    publishers:
+#      - naginator:
+#          max-failed-builds: 2
+#          rerun-unstable-builds: true
+#          progressive-delay-increment: 2
+#          progressive-delay-maximum: 6
+#          regular-expression: "/.*Timed out waiting for device dev-tty.*/"
+
+################################################################################
+################################################################################
+# -verify-CIBT-complete = CI BOOT TEST executed, send email
+################################################################################
+- job-template:
+    name: 'ci-platform-AGL-repo-verify-CIBT-complete'
+    project-type: freestyle
+    concurrent: true
+    node: control-slave
+    description: "Managed by JJB. Do not Edit. \
+                  <br>Build time graph:<br><img src='buildTimeGraph/png' />"
+    parameters:
+      - string:
+          name: GERRIT_PROJECT
+          default: 'AGL/AGL-repo'
+          description: "Project to build"
+      - string:
+          name: GERRIT_BRANCH
+          default: master
+          description: "branch to build"
+      - string:
+          name: GERRIT_REFSPEC
+          default: refs/heads/master
+          description: "refspec to build"
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: "8313"
+          description: "change # to build"
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: "2"
+          description: "patchset # to build"
+    build-discarder:
+      days-to-keep: 30
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+      - openstack:
+          single-use: false
+      - credentials-binding:
+          - text:
+              credential-id: KCI_EMAIL_AUTH_TOKEN
+              variable: KCI_EMAIL_AUTH_TOKEN
+    builders:
+      - shell:
+          !include-raw-escape:
+          - ../common/include-agl-header.sh
+          - ../common/include-agl-send-email-report.sh
+
+################################################################################
+################################################################################
+# -verify-CIBT-finish-success = CI BOOT TEST succeeded, CIBT+1 to gerrit
+################################################################################
+- job-template:
+    name: 'ci-platform-AGL-repo-verify-CIBT-finish-success'
+    project-type: freestyle
+    concurrent: true
+    node: control-slave
+    description: "Managed by JJB. Do not Edit. \
+                  <br>Build time graph:<br><img src='buildTimeGraph/png' />"
+    parameters:
+      - string:
+          name: GERRIT_PROJECT
+          default: 'AGL/AGL-repo'
+          description: "Project to build"
+      - string:
+          name: GERRIT_BRANCH
+          default: master
+          description: "branch to build"
+      - string:
+          name: GERRIT_REFSPEC
+          default: refs/heads/master
+          description: "refspec to build"
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: "8313"
+          description: "change # to build"
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: "2"
+          description: "patchset # to build"
+    build-discarder:
+      days-to-keep: 30
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+      - openstack:
+          single-use: false
+    builders:
+      - shell: |
+          # set
+          echo "#### CIBT +1 ####"
+          ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 --label ci-image-boot-test=+1 -n NONE --message='CI-Image-Boot-Test\ finished' || true
+
+
+################################################################################################################################################################
+################################################################################################################################################################
+
+################################################################################
+################################################################################
+# -remove-artifacts = merge/abandon, remove artifacts and later trigger sstate
+################################################################################
+- job-template:
+    name: 'ci-platform-AGL-repo-remove-artifacts'
+    project-type: freestyle
+    concurrent: true
+    node: control-slave
+    description: "Managed by JJB. Do not Edit. \
+                  <br>Build time graph:<br><img src='buildTimeGraph/png' />"
+    parameters:
+      - string:
+          name: GERRIT_PROJECT
+          default: 'AGL/AGL-repo'
+          description: "Project to build"
+      - string:
+          name: GERRIT_BRANCH
+          default: master
+          description: "branch to build"
+      - string:
+          name: GERRIT_REFSPEC
+          default: refs/heads/master
+          description: "refspec to build"
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: "8313"
+          description: "change # to build"
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: "2"
+          description: "patchset # to build"
+    build-discarder:
+      days-to-keep: 30
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+      - openstack:
+          single-use: false
+    triggers:
+      - gerrit-trigger-silent-patch-merged-abandoned:
+          name: 'AGL/AGL-repo'
+          branch: '**/**/**'
+    builders:
+      - shell:
+          !include-raw-escape:
+          - ../common/include-agl-remove-artifacts-changeid.sh
+
diff --git a/jjb/ci-AGL-verify/ci-platform-AGL-repo-verify-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-AGL-repo-verify-jjb.yaml
new file mode 100644
index 00000000..75aa0c9a
--- /dev/null
+++ b/jjb/ci-AGL-verify/ci-platform-AGL-repo-verify-jjb.yaml
@@ -0,0 +1,197 @@
+---
+- project:
+    name: ci-platform-AGL-repo-1
+    machine:
+      - bbe
+      - h3ulcb-nogfx
+      - qemux86-64
+      - qemuarm
+      - qemuarm64
+      - raspberrypi4
+    jobs:
+      - ci-platform-AGL-repo-verify
+    description: "Managed by JJB. Do not Edit. \
+                  <br>Build time graph:<br><img src='buildTimeGraph/png' />"
+
+
+################################################################################################################################################################
+################################################################################################################################################################
+
+################################################################################
+################################################################################
+# -verify  = trigger from gerrit and control job, multijob order
+################################################################################
+- job-template:
+    name: 'ci-platform-AGL-repo-verify'
+    project-type: multijob
+    concurrent: true
+    node: control-slave
+    description: "Managed by JJB. Do not Edit. \
+                  <br>Build time graph:<br><img src='buildTimeGraph/png' />"
+    parameters:
+      - string:
+          name: GERRIT_PROJECT
+          default: 'AGL/AGL-repo'
+          description: "Project to build"
+      - string:
+          name: GERRIT_BRANCH
+          default: master
+          description: "branch to build"
+      - string:
+          name: GERRIT_REFSPEC
+          default: refs/heads/master
+          description: "refspec to build"
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: "8313"
+          description: "change # to build"
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: "2"
+          description: "patchset # to build"
+    build-discarder:
+      days-to-keep: 30
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+    triggers:
+      - gerrit-trigger-patch-submitted-manual-verified:
+          name: 'AGL/AGL-repo'
+          branch: '**/**/**'
+          file-paths:
+              - compare-type: REG_EXP
+                pattern: 'jsmxml'
+
+          
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+    builders:
+      - shell: |
+          #set -x
+          export TRIGGERURL=$(echo ${{BUILD_URL}} | sed -e 's,-CIB-start.*,,')
+          echo \$TRIGGERURL
+          ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 -n NONE --message="CI-cycle\ started.\ URL:\ ${{BUILD_URL}}" || true
+          # - multijob:
+          #     name: CIB-AGL-repo-start
+          #     condition: SUCCESSFUL
+          #     projects:
+          #       - name: 'ci-platform-AGL-repo-verify-CIB-start'
+          #         current-parameters: true
+          #         abort-all-job: true
+          #         kill-phase-on: FAILURE
+      - multijob:
+          name: CIB-AGL-repo-touchstone
+          condition: SUCCESSFUL
+          projects:
+            - name: 'ci-platform-AGL-repo-verify-CIB-qemux86-64'
+              current-parameters: true
+              abort-all-job: true
+              kill-phase-on: FAILURE
+      - multijob:
+          name: CIB-AGL-repo-devboards
+          condition: SUCCESSFUL
+          projects:
+            - name: 'ci-platform-AGL-repo-verify-CIB-qemuarm'
+              current-parameters: true
+              #abort-all-job: true
+              kill-phase-on: FAILURE
+            - name: 'ci-platform-AGL-repo-verify-CIB-qemuarm64'
+              current-parameters: true
+              #abort-all-job: true
+              kill-phase-on: FAILURE
+            - name: 'ci-platform-AGL-repo-verify-CIB-bbe'
+              current-parameters: true
+              #abort-all-job: true
+              kill-phase-on: NEVER
+            - name: 'ci-platform-AGL-repo-verify-CIB-h3ulcb-nogfx'
+              current-parameters: true
+              #abort-all-job: true
+              kill-phase-on: FAILURE
+            - name: 'ci-platform-AGL-repo-verify-CIB-raspberrypi4'
+              current-parameters: true
+              kill-phase-on: FAILURE
+      - multijob:
+          name: CIB-AGL-repo-finish-success
+          condition: SUCCESSFUL
+          projects:
+            - name: 'ci-platform-AGL-repo-verify-CIB-finish-success'
+              current-parameters: true
+              #abort-all-job: true
+              kill-phase-on: FAILURE
+      #- multijob:
+      #    name: CIB-AGL-repo-verify-failure
+      #    condition: FAILURE
+      #    projects:
+      #      - name: 'ci-platform-AGL-repo-verify-failure'
+      #        current-parameters: true
+      #        #abort-all-job: true
+      #        kill-phase-on: FAILURE
+      # - multijob:
+      #     name: 'CIBT-AGL-repo-start'
+      #     condition: SUCCESSFUL
+      #     projects:
+      #       - name: 'ci-platform-AGL-repo-verify-CIBT-start'
+      #         current-parameters: true
+      #         abort-all-job: true
+      #         kill-phase-on: FAILURE
+      - multijob:
+          name: CIBT-AGL-repo
+          condition: SUCCESSFUL
+          projects:
+            - name: 'ci-platform-AGL-repo-verify-CIBT-qemux86-64'
+              current-parameters: true
+              #abort-all-job: true
+              kill-phase-on: NEVER
+            - name: 'ci-platform-AGL-repo-verify-CIBT-qemuarm'
+              current-parameters: true
+              #abort-all-job: true
+              kill-phase-on: NEVER
+            - name: 'ci-platform-AGL-repo-verify-CIBT-qemuarm64'
+              current-parameters: true
+              #abort-all-job: true
+              kill-phase-on: NEVER
+            - name: 'ci-platform-AGL-repo-verify-CIBT-h3ulcb-nogfx'
+              current-parameters: true
+              #abort-all-job: true
+              kill-phase-on: NEVER
+            - name: 'ci-platform-AGL-repo-verify-CIBT-raspberrypi4'
+              current-parameters: true
+              #abort-all-job: true
+              kill-phase-on: NEVER
+      - multijob:
+          name: 'CIBT-AGL-repo-complete'
+          condition: ALWAYS
+          projects:
+            - name: 'ci-platform-AGL-repo-verify-CIBT-complete'
+              current-parameters: true
+              abort-all-job: true
+              kill-phase-on: NEVER
+      - multijob:
+          name: 'CIBT-AGL-repo-finish-success'
+          condition: SUCCESSFUL
+          projects:
+            - name: 'ci-platform-AGL-repo-verify-CIBT-finish-success'
+              current-parameters: true
+              abort-all-job: false
+              kill-phase-on: NEVER
+      - multijob:
+          name: CIB-AGL-repo-extra-variants
+          condition: COMPLETED
+          projects:
+            - name: 'ci-platform-AGL-repo-verify-CIB-html5-qemux86-64'
+              current-parameters: true
+              abort-all-job: false
+              kill-phase-on: NEVER
+            - name: 'ci-platform-AGL-repo-verify-CIB-aglcompositor-qemux86-64'
+              current-parameters: true
+              abort-all-job: false
+              kill-phase-on: NEVER
+
+    publishers:
+      - trigger-parameterized-builds:
+        - project:
+          - ci-platform-AGL-repo-verify-failure
+          condition: FAILED
+          current-parameters: true
+          predefined-parameters: ORIG_BUILD_URL=${{BUILD_URL}}
+
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index bba06496..f96e40c4 100644
--- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml
+++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
@@ -13,7 +13,6 @@
       - meta-agl-demo
       - meta-agl-devel
       - meta-agl-extra
-      - AGL-repo
       - meta-renesas
       - meta-renesas-rcar-gen3
     jobs:
@@ -36,10 +35,6 @@
 ################################################################################################################################################################
 ################################################################################################################################################################
 
-################################################################################
-################################################################################
-# -verify  = trigger from gerrit and control job, multijob order
-################################################################################
 - job-template:
     name: 'ci-platform-{project}-verify'
     project-type: multijob