From 5dd0bb390114693d3acf30626b8e84d59e6685cb Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Tue, 18 Apr 2023 12:39:50 -0700 Subject: [PATCH 01/16] Chore: Add info job and view for robot repo Change-Id: Id6d0bce704eea5a8ff92f882fc01d9090a9b8cde Signed-off-by: Eric Ball --- jjb/robot/robot.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 jjb/robot/robot.yaml diff --git a/jjb/robot/robot.yaml b/jjb/robot/robot.yaml new file mode 100644 index 0000000..cc43e3b --- /dev/null +++ b/jjb/robot/robot.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: robot-project-view + project-name: robot + views: + - project-view + +- project: + name: robot-info + project: robot + project-name: robot + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify -- 2.16.6 From f7bdddeeb790b42e37846288bd22e4515eebb6e5 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Wed, 19 Apr 2023 08:40:10 +1000 Subject: [PATCH 02/16] Refactor!: JJB code to comply with updates to v5.x Update global-jjb v0.86.0, this updates the minimal version of JJB to v5.0.2. Change-Id: I73f710ee47720aa97d274577c1a86bf526a5651c Signed-off-by: Anil Belur --- global-jjb | 2 +- jjb/akraino-templates/akraino-icn-templates.yaml | 2 +- jjb/akraino-templates/akraino-jjb-kni.yaml | 6 +++--- jjb/akraino-templates/akraino-jjb-templates.yaml | 3 ++- jjb/akraino-templates/akraino-validation-macros.yaml | 2 +- jjb/ci-management/static-slaves-ci-jobs.yaml | 3 ++- jjb/iec/iec.yaml | 2 +- jjb/rec/rec.yaml | 2 +- jjb/validation/bluval.yaml | 2 +- jjb/validation/lab.yaml | 2 +- 10 files changed, 14 insertions(+), 12 deletions(-) diff --git a/global-jjb b/global-jjb index 02860f8..de13320 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 02860f86d24223854948d1d13a91a77496e7bd0f +Subproject commit de13320dea5c46324937b12f69435e082e4edf0b diff --git a/jjb/akraino-templates/akraino-icn-templates.yaml b/jjb/akraino-templates/akraino-icn-templates.yaml index 9b2953c..9a185b3 100644 --- a/jjb/akraino-templates/akraino-icn-templates.yaml +++ b/jjb/akraino-templates/akraino-icn-templates.yaml @@ -15,7 +15,7 @@ # limitations under the License. # -- daaas_job_boiler_plate: &daaas_job_boiler_plate +- _daaas_job_boiler_plate: &daaas_job_boiler_plate name: daaas_job_boiler_plate archive-artifacts: > **/*.log diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml index 7edb45c..a9fc7d9 100644 --- a/jjb/akraino-templates/akraino-jjb-kni.yaml +++ b/jjb/akraino-templates/akraino-jjb-kni.yaml @@ -36,14 +36,14 @@ - description-setter: regexp: "(^(Nexus|S3) build logs: .*)" -- kni_common: &kni_common +- _kni_common: &kni_common name: kni-common ###################### # Default parameters # ###################### - build-node: "{build-node}" + build-node: "" build-days-to-keep: 30 build-timeout: 60 submodule-recursive: true @@ -105,7 +105,7 @@ publishers: - lf-infra-publish -- kni_common_deploy: &kni_common_deploy +- _kni_common_deploy: &kni_common_deploy name: kni-common-deploy <<: *kni_common archive-artifacts: > diff --git a/jjb/akraino-templates/akraino-jjb-templates.yaml b/jjb/akraino-templates/akraino-jjb-templates.yaml index ed7e8f0..b320852 100644 --- a/jjb/akraino-templates/akraino-jjb-templates.yaml +++ b/jjb/akraino-templates/akraino-jjb-templates.yaml @@ -348,7 +348,8 @@ - job-template: id: akraino-project-build-node-init name: '{project-name}-{build-node}-init' - disabled: '{obj:disabled}' + # disable_job: false + disabled: '{obj:disable_job}' concurrent: true parameters: diff --git a/jjb/akraino-templates/akraino-validation-macros.yaml b/jjb/akraino-templates/akraino-validation-macros.yaml index 193657f..68ad5c5 100644 --- a/jjb/akraino-templates/akraino-validation-macros.yaml +++ b/jjb/akraino-templates/akraino-validation-macros.yaml @@ -59,7 +59,7 @@ # SETTINGS # ############ # settings for jobs run in multijob phases -- docker-build-job-settings: &docker-build-job-settings +- _docker-build-job-settings: &docker-build-job-settings name: docker_build_job_settings current-parameters: true git-revision: false diff --git a/jjb/ci-management/static-slaves-ci-jobs.yaml b/jjb/ci-management/static-slaves-ci-jobs.yaml index bb36b03..528d260 100644 --- a/jjb/ci-management/static-slaves-ci-jobs.yaml +++ b/jjb/ci-management/static-slaves-ci-jobs.yaml @@ -14,4 +14,5 @@ - aarch64_baremetal_dev jobs: - - akraino-project-build-node-init + - akraino-project-build-node-init: + disable_job: false diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml index 78b1c2d..261dfd2 100644 --- a/jjb/iec/iec.yaml +++ b/jjb/iec/iec.yaml @@ -12,7 +12,7 @@ # ------------------------------- stream: - master: - branch: '{stream}' + branch: 'master' gs-pathname: '' disabled: false diff --git a/jjb/rec/rec.yaml b/jjb/rec/rec.yaml index c41d57f..8a80b3b 100644 --- a/jjb/rec/rec.yaml +++ b/jjb/rec/rec.yaml @@ -10,7 +10,7 @@ # ------------------------------- stream: - master: - branch: '{stream}' + branch: master disabled: false # ------------------------------- diff --git a/jjb/validation/bluval.yaml b/jjb/validation/bluval.yaml index df9897f..e01b3bc 100644 --- a/jjb/validation/bluval.yaml +++ b/jjb/validation/bluval.yaml @@ -19,7 +19,7 @@ name: bluval project-name: validation project: validation - build-node: '{build-node}' + build-node: centos7-builder-2c-1g group-id: org.akraino.validation refspec: refs/heads/master branch: master diff --git a/jjb/validation/lab.yaml b/jjb/validation/lab.yaml index c31838b..c8e3d98 100644 --- a/jjb/validation/lab.yaml +++ b/jjb/validation/lab.yaml @@ -19,7 +19,7 @@ name: lab project-name: validation project: validation - build-node: '{build-node}' + build-node: centos7-builder-2c-1g stream: - master: branch: '{stream}' -- 2.16.6 From 9766b17ac5c36fb2a1b613066fcf1b7165d4f5c1 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Thu, 4 May 2023 11:04:16 -0700 Subject: [PATCH 03/16] CI: Add GHA for verification Change-Id: Idbaf7b32701386818ddc0da607a94bd57644ebdd Signed-off-by: Eric Ball --- .github/workflows/gerrit-verify.yaml | 142 +++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 .github/workflows/gerrit-verify.yaml diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml new file mode 100644 index 0000000..ea754d8 --- /dev/null +++ b/.github/workflows/gerrit-verify.yaml @@ -0,0 +1,142 @@ +--- +name: Gerrit Verify + +# yamllint disable-line rule:truthy +on: + workflow_dispatch: + inputs: + GERRIT_BRANCH: + description: "Branch that change is against" + required: true + type: string + GERRIT_CHANGE_ID: + description: "The ID for the change" + required: true + type: string + GERRIT_CHANGE_NUMBER: + description: "The Gerrit number" + required: true + type: string + GERRIT_CHANGE_URL: + description: "URL to the change" + required: true + type: string + GERRIT_EVENT_TYPE: + description: "Type of Gerrit event" + required: true + type: string + GERRIT_PATCHSET_NUMBER: + description: "The patch number for the change" + required: true + type: string + GERRIT_PATCHSET_REVISION: + description: "The revision sha" + required: true + type: string + GERRIT_PROJECT: + description: "Project in Gerrit" + required: true + type: string + GERRIT_REFSPEC: + description: "Gerrit refspec of change" + required: true + type: string + +concurrency: + group: ${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }} + cancel-in-progress: true + +jobs: + prepare: + runs-on: ubuntu-latest + steps: + - name: Clear votes + uses: lfit/gerrit-review-action@v0.3 + with: + host: ${{ vars.GERRIT_SERVER }} + username: ${{ vars.GERRIT_SSH_USER }} + key: ${{ secrets.GERRIT_SSH_PRIVKEY }} + known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }} + gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }} + gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }} + vote-type: clear + - name: Allow replication + run: sleep 10s + + actionlint: + needs: prepare + runs-on: ubuntu-latest + steps: + - uses: lfit/checkout-gerrit-change-action@v0.3 + with: + gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }} + delay: "0s" + - name: Download actionlint + id: get_actionlint + run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) + shell: bash + - name: Check workflow files + run: ${{ steps.get_actionlint.outputs.executable }} -color + shell: bash + + # run pre-commit tox env separately to get use of more parallel processing + pre-commit: + needs: prepare + runs-on: ubuntu-latest + steps: + - uses: lfit/checkout-gerrit-change-action@v0.3 + with: + gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }} + delay: "0s" + - uses: actions/setup-python@v4 + with: + python-version: "3.11" + - name: Run static analysis and format checkers + run: pipx run pre-commit run --all-files --show-diff-on-failure + + jjb-validation: + needs: prepare + runs-on: ubuntu-latest + steps: + - uses: lfit/checkout-gerrit-change-action@v0.3 + with: + gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }} + delay: "0s" + - uses: actions/setup-python@v4 + id: setup-python + with: + python-version: "3.11" + - name: Clone git submodules + run: git submodule update --init + - name: Run JJB Verify + run: | + python -m pip install --upgrade pip + pip install jenkins-job-builder + mkdir -p "${HOME}/.config/jenkins_jobs" + cat << EOF > "${HOME}/.config/jenkins_jobs/jenkins_jobs.ini" + [job_builder] + ignore_cache=True + keep_descriptions=False + include_path=. + recursive=True + query_plugins_info=False + config-xml=True + EOF + jenkins-jobs test -o archives/job-configs jjb/ + + vote: + if: ${{ always() }} + needs: [prepare, actionlint, pre-commit, jjb-validation] + runs-on: ubuntu-latest + steps: + - uses: technote-space/workflow-conclusion-action@v3 + - name: Set vote + uses: lfit/gerrit-review-action@v0.3 + with: + host: ${{ vars.GERRIT_SERVER }} + username: ${{ vars.GERRIT_SSH_USER }} + key: ${{ secrets.GERRIT_SSH_PRIVKEY }} + known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }} + gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }} + gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }} + vote-type: ${{ env.WORKFLOW_CONCLUSION }} -- 2.16.6 From 09562b820c57ef6f37a0b8cee55d76a1b175f384 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 11 May 2023 08:20:51 +1000 Subject: [PATCH 04/16] CI: Upgrade global-jjb to latest v0.86.5 Signed-off-by: Anil Belur Change-Id: I460b4bc67002d65056f1f51db984858cea10c761 --- global-jjb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global-jjb b/global-jjb index de13320..d31ff46 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit de13320dea5c46324937b12f69435e082e4edf0b +Subproject commit d31ff4635d1dc4a6afe4cf3be622a219be5f1318 -- 2.16.6 From 4e5c9ddc4c20db70debd36d2e7f349a74bff23dc Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 11 May 2023 08:21:47 +1000 Subject: [PATCH 05/16] CI: Update common packer to latest v0.12.1 Signed-off-by: Anil Belur Change-Id: I3f97794945c12d24c78251c5cf3b6621f4b8b898 --- packer/common-packer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/common-packer b/packer/common-packer index b8bffd6..15aba27 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit b8bffd625cbf589079fcfd9ba1a37c91fdc7f99b +Subproject commit 15aba27a45f98edb33890daa3712c6a4371b2947 -- 2.16.6 From fa2ec188f24f35d232cecf0cc91913904253e898 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Thu, 4 May 2023 10:56:08 -0700 Subject: [PATCH 06/16] Refactor: Cleanup TA JJB for pre-commit Change-Id: Ib7c8c15dfce840941d4c827e602cda7e119c1bfa Signed-off-by: Eric Ball --- jjb/ta/access-management.yaml | 9 +++++---- jjb/ta/ansible-role-ntp.yaml | 9 +++++---- jjb/ta/build-tools.yaml | 5 +++-- jjb/ta/caas-cpupooler.yaml | 9 +++++---- jjb/ta/caas-danm.yaml | 9 +++++---- jjb/ta/caas-etcd.yaml | 9 +++++---- jjb/ta/caas-helm.yaml | 9 +++++---- jjb/ta/caas-install.yaml | 9 +++++---- jjb/ta/caas-kubedns.yaml | 9 +++++---- jjb/ta/caas-kubernetes.yaml | 9 +++++---- jjb/ta/caas-lcm.yaml | 9 +++++---- jjb/ta/caas-logging.yaml | 9 +++++---- jjb/ta/caas-metrics.yaml | 9 +++++---- jjb/ta/caas-registry.yaml | 9 +++++---- jjb/ta/caas-security.yaml | 9 +++++---- jjb/ta/caas-storage.yaml | 9 +++++---- jjb/ta/ci-build.yaml | 1 + jjb/ta/cloudtaf.yaml | 5 +++-- jjb/ta/cm-plugins.yaml | 9 +++++---- jjb/ta/config-manager.yaml | 9 +++++---- jjb/ta/distributed-state-server.yaml | 9 +++++---- jjb/ta/hostcli.yaml | 9 +++++---- jjb/ta/hw-detector.yaml | 9 +++++---- jjb/ta/image-provision.yaml | 9 +++++---- jjb/ta/infra-ansible.yaml | 9 +++++---- jjb/ta/ipa-deployer.yaml | 9 +++++---- jjb/ta/ironic-virtmedia-driver.yaml | 9 +++++---- jjb/ta/ironic.yaml | 9 +++++---- jjb/ta/ironicclient.yaml | 9 +++++---- jjb/ta/lockcli.yaml | 9 +++++---- jjb/ta/manifest.yaml | 5 +++-- jjb/ta/monitoring.yaml | 9 +++++---- jjb/ta/openstack-ansible-galera_client.yaml | 9 +++++---- jjb/ta/openstack-ansible-galera_server.yaml | 9 +++++---- jjb/ta/openstack-ansible-haproxy_server.yaml | 9 +++++---- jjb/ta/openstack-ansible-memcached_server.yaml | 9 +++++---- jjb/ta/openstack-ansible-openstack_openrc.yaml | 9 +++++---- jjb/ta/openstack-ansible-os_ironic.yaml | 9 +++++---- jjb/ta/openstack-ansible-os_keystone.yaml | 9 +++++---- jjb/ta/openstack-ansible-plugins.yaml | 9 +++++---- jjb/ta/openstack-ansible-rabbitmq_server.yaml | 9 +++++---- jjb/ta/openstack-ansible-rsyslog_client.yaml | 9 +++++---- jjb/ta/openstack-ansible.yaml | 9 +++++---- jjb/ta/os-net-config.yaml | 9 +++++---- jjb/ta/python-ilorest-library.yaml | 9 +++++---- jjb/ta/python-peewee.yaml | 9 +++++---- jjb/ta/remote-installer.yaml | 8 ++++---- jjb/ta/rpmbuilder.yaml | 5 +++-- jjb/ta/start-menu.yaml | 9 +++++---- jjb/ta/storage.yaml | 9 +++++---- jjb/ta/yarf.yaml | 9 +++++---- 51 files changed, 242 insertions(+), 192 deletions(-) diff --git a/jjb/ta/access-management.yaml b/jjb/ta/access-management.yaml index b543c11..7b098b5 100644 --- a/jjb/ta/access-management.yaml +++ b/jjb/ta/access-management.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-access-management-amd64 project: ta/access-management project-name: ta-access-management-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/access-management project-name: ta-access-management-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/ansible-role-ntp.yaml b/jjb/ta/ansible-role-ntp.yaml index 4e67432..a4248af 100644 --- a/jjb/ta/ansible-role-ntp.yaml +++ b/jjb/ta/ansible-role-ntp.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-ansible-role-ntp-amd64 project: ta/ansible-role-ntp project-name: ta-ansible-role-ntp-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/ansible-role-ntp project-name: ta-ansible-role-ntp-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/build-tools.yaml b/jjb/ta/build-tools.yaml index 09e3865..f596d92 100644 --- a/jjb/ta/build-tools.yaml +++ b/jjb/ta/build-tools.yaml @@ -1,9 +1,10 @@ +--- - project: name: ta-build-tools-amd64 project: ta/build-tools project-name: ta-build-tools-amd64 project-type: - - verify + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -14,7 +15,7 @@ project: ta/build-tools project-name: ta-build-tools-arm64 project-type: - - verify + - verify build-node: aarch64_build stream: master jobs: diff --git a/jjb/ta/caas-cpupooler.yaml b/jjb/ta/caas-cpupooler.yaml index b493392..bac8674 100644 --- a/jjb/ta/caas-cpupooler.yaml +++ b/jjb/ta/caas-cpupooler.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-caas-cpupooler-amd64 project: ta/caas-cpupooler project-name: ta-caas-cpupooler-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-8g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/caas-cpupooler project-name: ta-caas-cpupooler-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/caas-danm.yaml b/jjb/ta/caas-danm.yaml index e0fbdc9..2f2b272 100644 --- a/jjb/ta/caas-danm.yaml +++ b/jjb/ta/caas-danm.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-caas-danm-amd64 project: ta/caas-danm project-name: ta-caas-danm-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-8g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/caas-danm project-name: ta-caas-danm-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/caas-etcd.yaml b/jjb/ta/caas-etcd.yaml index 8184ee3..8096b51 100644 --- a/jjb/ta/caas-etcd.yaml +++ b/jjb/ta/caas-etcd.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-caas-etcd-amd64 project: ta/caas-etcd project-name: ta-caas-etcd-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-8g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/caas-etcd project-name: ta-caas-etcd-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/caas-helm.yaml b/jjb/ta/caas-helm.yaml index 50080c2..6ba9340 100644 --- a/jjb/ta/caas-helm.yaml +++ b/jjb/ta/caas-helm.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-caas-helm-amd64 project: ta/caas-helm project-name: ta-caas-helm-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-8c-8g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/caas-helm project-name: ta-caas-helm-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/caas-install.yaml b/jjb/ta/caas-install.yaml index 72fa44c..aaeca72 100644 --- a/jjb/ta/caas-install.yaml +++ b/jjb/ta/caas-install.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-caas-install-amd64 project: ta/caas-install project-name: ta-caas-install-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/caas-install project-name: ta-caas-install-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/caas-kubedns.yaml b/jjb/ta/caas-kubedns.yaml index 824a9c3..8a276eb 100644 --- a/jjb/ta/caas-kubedns.yaml +++ b/jjb/ta/caas-kubedns.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-caas-kubedns-amd64 project: ta/caas-kubedns project-name: ta-caas-kubedns-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-8g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/caas-kubedns project-name: ta-caas-kubedns-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/caas-kubernetes.yaml b/jjb/ta/caas-kubernetes.yaml index 1924654..f728240 100644 --- a/jjb/ta/caas-kubernetes.yaml +++ b/jjb/ta/caas-kubernetes.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-caas-kubernetes-amd64 project: ta/caas-kubernetes project-name: ta-caas-kubernetes-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-8c-8g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/caas-kubernetes project-name: ta-caas-kubernetes-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/caas-lcm.yaml b/jjb/ta/caas-lcm.yaml index 5f48f1f..a6727d9 100644 --- a/jjb/ta/caas-lcm.yaml +++ b/jjb/ta/caas-lcm.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-caas-lcm-amd64 project: ta/caas-lcm project-name: ta-caas-lcm-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/caas-lcm project-name: ta-caas-lcm-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/caas-logging.yaml b/jjb/ta/caas-logging.yaml index 6c63e96..21bdb43 100644 --- a/jjb/ta/caas-logging.yaml +++ b/jjb/ta/caas-logging.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-caas-logging-amd64 project: ta/caas-logging project-name: ta-caas-logging-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/caas-logging project-name: ta-caas-logging-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/caas-metrics.yaml b/jjb/ta/caas-metrics.yaml index 556d2a9..adef144 100644 --- a/jjb/ta/caas-metrics.yaml +++ b/jjb/ta/caas-metrics.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-caas-metrics-amd64 project: ta/caas-metrics project-name: ta-caas-metrics-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-8c-16g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/caas-metrics project-name: ta-caas-metrics-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/caas-registry.yaml b/jjb/ta/caas-registry.yaml index 8aea44f..fa23b0c 100644 --- a/jjb/ta/caas-registry.yaml +++ b/jjb/ta/caas-registry.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-caas-registry-amd64 project: ta/caas-registry project-name: ta-caas-registry-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-8g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/caas-registry project-name: ta-caas-registry-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/caas-security.yaml b/jjb/ta/caas-security.yaml index eae6b3b..4fc7bd7 100644 --- a/jjb/ta/caas-security.yaml +++ b/jjb/ta/caas-security.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-caas-security-amd64 project: ta/caas-security project-name: ta-caas-security-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/caas-security project-name: ta-caas-security-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/caas-storage.yaml b/jjb/ta/caas-storage.yaml index ed50a87..76a1d56 100644 --- a/jjb/ta/caas-storage.yaml +++ b/jjb/ta/caas-storage.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-caas-storage-amd64 project: ta/caas-storage project-name: ta-caas-storage-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-8g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/caas-storage project-name: ta-caas-storage-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/ci-build.yaml b/jjb/ta/ci-build.yaml index 83a79a2..88c8ee0 100644 --- a/jjb/ta/ci-build.yaml +++ b/jjb/ta/ci-build.yaml @@ -1,3 +1,4 @@ +--- - project: name: ta-ci-build-amd64 project: none diff --git a/jjb/ta/cloudtaf.yaml b/jjb/ta/cloudtaf.yaml index bfc81bb..5560aad 100644 --- a/jjb/ta/cloudtaf.yaml +++ b/jjb/ta/cloudtaf.yaml @@ -1,9 +1,10 @@ +--- - project: name: ta-cloudtaf-amd64 project: ta/cloudtaf project-name: ta-cloudtaf-amd64 project-type: - - verify + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -14,7 +15,7 @@ project: ta/cloudtaf project-name: ta-cloudtaf-arm64 project-type: - - verify + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/cm-plugins.yaml b/jjb/ta/cm-plugins.yaml index 8962783..6c51dc5 100644 --- a/jjb/ta/cm-plugins.yaml +++ b/jjb/ta/cm-plugins.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-cm-plugins-amd64 project: ta/cm-plugins project-name: ta-cm-plugins-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/cm-plugins project-name: ta-cm-plugins-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/config-manager.yaml b/jjb/ta/config-manager.yaml index b47e103..ef31342 100644 --- a/jjb/ta/config-manager.yaml +++ b/jjb/ta/config-manager.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-config-manager-amd64 project: ta/config-manager project-name: ta-config-manager-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/config-manager project-name: ta-config-manager-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/distributed-state-server.yaml b/jjb/ta/distributed-state-server.yaml index 747ed47..553f26d 100644 --- a/jjb/ta/distributed-state-server.yaml +++ b/jjb/ta/distributed-state-server.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-distributed-state-server-amd64 project: ta/distributed-state-server project-name: ta-distributed-state-server-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/distributed-state-server project-name: ta-distributed-state-server-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/hostcli.yaml b/jjb/ta/hostcli.yaml index 6085957..31fe926 100644 --- a/jjb/ta/hostcli.yaml +++ b/jjb/ta/hostcli.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-hostcli-amd64 project: ta/hostcli project-name: ta-hostcli-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/hostcli project-name: ta-hostcli-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/hw-detector.yaml b/jjb/ta/hw-detector.yaml index 5f99dba..ec64816 100644 --- a/jjb/ta/hw-detector.yaml +++ b/jjb/ta/hw-detector.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-hw-detector-amd64 project: ta/hw-detector project-name: ta-hw-detector-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/hw-detector project-name: ta-hw-detector-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/image-provision.yaml b/jjb/ta/image-provision.yaml index 778bb01..fd71e8a 100644 --- a/jjb/ta/image-provision.yaml +++ b/jjb/ta/image-provision.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-image-provision-amd64 project: ta/image-provision project-name: ta-image-provision-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/image-provision project-name: ta-image-provision-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/infra-ansible.yaml b/jjb/ta/infra-ansible.yaml index 00b6826..a78fa9f 100644 --- a/jjb/ta/infra-ansible.yaml +++ b/jjb/ta/infra-ansible.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-infra-ansible-amd64 project: ta/infra-ansible project-name: ta-infra-ansible-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/infra-ansible project-name: ta-infra-ansible-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/ipa-deployer.yaml b/jjb/ta/ipa-deployer.yaml index 388a10f..807c8db 100644 --- a/jjb/ta/ipa-deployer.yaml +++ b/jjb/ta/ipa-deployer.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-ipa-deployer-amd64 project: ta/ipa-deployer project-name: ta-ipa-deployer-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/ipa-deployer project-name: ta-ipa-deployer-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/ironic-virtmedia-driver.yaml b/jjb/ta/ironic-virtmedia-driver.yaml index 9181af6..d1bc586 100644 --- a/jjb/ta/ironic-virtmedia-driver.yaml +++ b/jjb/ta/ironic-virtmedia-driver.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-ironic-virtmedia-driver-amd64 project: ta/ironic-virtmedia-driver project-name: ta-ironic-virtmedia-driver-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/ironic-virtmedia-driver project-name: ta-ironic-virtmedia-driver-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/ironic.yaml b/jjb/ta/ironic.yaml index da05368..3626c30 100644 --- a/jjb/ta/ironic.yaml +++ b/jjb/ta/ironic.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-ironic-amd64 project: ta/ironic project-name: ta-ironic-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-8c-8g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/ironic project-name: ta-ironic-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/ironicclient.yaml b/jjb/ta/ironicclient.yaml index 367974d..3d3a90e 100644 --- a/jjb/ta/ironicclient.yaml +++ b/jjb/ta/ironicclient.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-ironicclient-amd64 project: ta/ironicclient project-name: ta-ironicclient-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/ironicclient project-name: ta-ironicclient-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/lockcli.yaml b/jjb/ta/lockcli.yaml index a4ea841..582039c 100644 --- a/jjb/ta/lockcli.yaml +++ b/jjb/ta/lockcli.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-lockcli-amd64 project: ta/lockcli project-name: ta-lockcli-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/lockcli project-name: ta-lockcli-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/manifest.yaml b/jjb/ta/manifest.yaml index d1a807f..422d6a5 100644 --- a/jjb/ta/manifest.yaml +++ b/jjb/ta/manifest.yaml @@ -1,9 +1,10 @@ +--- - project: name: ta-manifest-amd64 project: ta/manifest project-name: ta-manifest-amd64 project-type: - - verify + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -14,7 +15,7 @@ project: ta/manifest project-name: ta-manifest-arm64 project-type: - - verify + - verify build-node: aarch64_build stream: master jobs: diff --git a/jjb/ta/monitoring.yaml b/jjb/ta/monitoring.yaml index 7751553..4c2eda0 100644 --- a/jjb/ta/monitoring.yaml +++ b/jjb/ta/monitoring.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-monitoring-amd64 project: ta/monitoring project-name: ta-monitoring-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/monitoring project-name: ta-monitoring-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/openstack-ansible-galera_client.yaml b/jjb/ta/openstack-ansible-galera_client.yaml index 9e3eb30..5ba51a9 100644 --- a/jjb/ta/openstack-ansible-galera_client.yaml +++ b/jjb/ta/openstack-ansible-galera_client.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-openstack-ansible-galera_client-amd64 project: ta/openstack-ansible-galera_client project-name: ta-openstack-ansible-galera_client-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/openstack-ansible-galera_client project-name: ta-openstack-ansible-galera_client-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/openstack-ansible-galera_server.yaml b/jjb/ta/openstack-ansible-galera_server.yaml index f0bb7b2..ee4d97e 100644 --- a/jjb/ta/openstack-ansible-galera_server.yaml +++ b/jjb/ta/openstack-ansible-galera_server.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-openstack-ansible-galera_server-amd64 project: ta/openstack-ansible-galera_server project-name: ta-openstack-ansible-galera_server-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/openstack-ansible-galera_server project-name: ta-openstack-ansible-galera_server-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/openstack-ansible-haproxy_server.yaml b/jjb/ta/openstack-ansible-haproxy_server.yaml index 2598384..d0ce0ee 100644 --- a/jjb/ta/openstack-ansible-haproxy_server.yaml +++ b/jjb/ta/openstack-ansible-haproxy_server.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-openstack-ansible-haproxy_server-amd64 project: ta/openstack-ansible-haproxy_server project-name: ta-openstack-ansible-haproxy_server-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/openstack-ansible-haproxy_server project-name: ta-openstack-ansible-haproxy_server-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/openstack-ansible-memcached_server.yaml b/jjb/ta/openstack-ansible-memcached_server.yaml index 9168c52..ccaa434 100644 --- a/jjb/ta/openstack-ansible-memcached_server.yaml +++ b/jjb/ta/openstack-ansible-memcached_server.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-openstack-ansible-memcached_server-amd64 project: ta/openstack-ansible-memcached_server project-name: ta-openstack-ansible-memcached_server-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/openstack-ansible-memcached_server project-name: ta-openstack-ansible-memcached_server-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/openstack-ansible-openstack_openrc.yaml b/jjb/ta/openstack-ansible-openstack_openrc.yaml index bb3562b..f84035b 100644 --- a/jjb/ta/openstack-ansible-openstack_openrc.yaml +++ b/jjb/ta/openstack-ansible-openstack_openrc.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-openstack-ansible-openstack_openrc-amd64 project: ta/openstack-ansible-openstack_openrc project-name: ta-openstack-ansible-openstack_openrc-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/openstack-ansible-openstack_openrc project-name: ta-openstack-ansible-openstack_openrc-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/openstack-ansible-os_ironic.yaml b/jjb/ta/openstack-ansible-os_ironic.yaml index 7cc48f4..2cee824 100644 --- a/jjb/ta/openstack-ansible-os_ironic.yaml +++ b/jjb/ta/openstack-ansible-os_ironic.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-openstack-ansible-os_ironic-amd64 project: ta/openstack-ansible-os_ironic project-name: ta-openstack-ansible-os_ironic-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/openstack-ansible-os_ironic project-name: ta-openstack-ansible-os_ironic-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/openstack-ansible-os_keystone.yaml b/jjb/ta/openstack-ansible-os_keystone.yaml index 566a2a6..dc3c63e 100644 --- a/jjb/ta/openstack-ansible-os_keystone.yaml +++ b/jjb/ta/openstack-ansible-os_keystone.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-openstack-ansible-os_keystone-amd64 project: ta/openstack-ansible-os_keystone project-name: ta-openstack-ansible-os_keystone-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/openstack-ansible-os_keystone project-name: ta-openstack-ansible-os_keystone-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/openstack-ansible-plugins.yaml b/jjb/ta/openstack-ansible-plugins.yaml index 5aafa3d..ee54e01 100644 --- a/jjb/ta/openstack-ansible-plugins.yaml +++ b/jjb/ta/openstack-ansible-plugins.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-openstack-ansible-plugins-amd64 project: ta/openstack-ansible-plugins project-name: ta-openstack-ansible-plugins-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/openstack-ansible-plugins project-name: ta-openstack-ansible-plugins-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/openstack-ansible-rabbitmq_server.yaml b/jjb/ta/openstack-ansible-rabbitmq_server.yaml index 36a963b..df1df1c 100644 --- a/jjb/ta/openstack-ansible-rabbitmq_server.yaml +++ b/jjb/ta/openstack-ansible-rabbitmq_server.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-openstack-ansible-rabbitmq_server-amd64 project: ta/openstack-ansible-rabbitmq_server project-name: ta-openstack-ansible-rabbitmq_server-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/openstack-ansible-rabbitmq_server project-name: ta-openstack-ansible-rabbitmq_server-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/openstack-ansible-rsyslog_client.yaml b/jjb/ta/openstack-ansible-rsyslog_client.yaml index c4016cd..4724191 100644 --- a/jjb/ta/openstack-ansible-rsyslog_client.yaml +++ b/jjb/ta/openstack-ansible-rsyslog_client.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-openstack-ansible-rsyslog_client-amd64 project: ta/openstack-ansible-rsyslog_client project-name: ta-openstack-ansible-rsyslog_client-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/openstack-ansible-rsyslog_client project-name: ta-openstack-ansible-rsyslog_client-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/openstack-ansible.yaml b/jjb/ta/openstack-ansible.yaml index 837069c..945a2b9 100644 --- a/jjb/ta/openstack-ansible.yaml +++ b/jjb/ta/openstack-ansible.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-openstack-ansible-amd64 project: ta/openstack-ansible project-name: ta-openstack-ansible-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/openstack-ansible project-name: ta-openstack-ansible-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/os-net-config.yaml b/jjb/ta/os-net-config.yaml index 2cdd66c..b4afc14 100644 --- a/jjb/ta/os-net-config.yaml +++ b/jjb/ta/os-net-config.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-os-net-config-amd64 project: ta/os-net-config project-name: ta-os-net-config-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/os-net-config project-name: ta-os-net-config-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/python-ilorest-library.yaml b/jjb/ta/python-ilorest-library.yaml index 094f32c..1ecc6f4 100644 --- a/jjb/ta/python-ilorest-library.yaml +++ b/jjb/ta/python-ilorest-library.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-python-ilorest-library-amd64 project: ta/python-ilorest-library project-name: ta-python-ilorest-library-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/python-ilorest-library project-name: ta-python-ilorest-library-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/python-peewee.yaml b/jjb/ta/python-peewee.yaml index 853f960..d6e4774 100644 --- a/jjb/ta/python-peewee.yaml +++ b/jjb/ta/python-peewee.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-python-peewee-amd64 project: ta/python-peewee project-name: ta-python-peewee-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/python-peewee project-name: ta-python-peewee-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/remote-installer.yaml b/jjb/ta/remote-installer.yaml index 176cffe..828d0ed 100644 --- a/jjb/ta/remote-installer.yaml +++ b/jjb/ta/remote-installer.yaml @@ -8,12 +8,12 @@ stream: master java-version: openjdk8 mvn-version: mvn35 - mvn-opts: '' - mvn-params: '' + mvn-opts: "" + mvn-params: "" mvn-settings: ta-settings build-timeout: 60 branch: master submodule-recursive: true jobs: - - 'akraino-project-stream-docker' - - 'akraino-project-stream-stage-docker' + - "akraino-project-stream-docker" + - "akraino-project-stream-stage-docker" diff --git a/jjb/ta/rpmbuilder.yaml b/jjb/ta/rpmbuilder.yaml index 5584f97..968e467 100644 --- a/jjb/ta/rpmbuilder.yaml +++ b/jjb/ta/rpmbuilder.yaml @@ -1,9 +1,10 @@ +--- - project: name: ta-rpmbuilder-amd64 project: ta/rpmbuilder project-name: ta-rpmbuilder-amd64 project-type: - - verify + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -14,7 +15,7 @@ project: ta/rpmbuilder project-name: ta-rpmbuilder-arm64 project-type: - - verify + - verify build-node: aarch64_build stream: master jobs: diff --git a/jjb/ta/start-menu.yaml b/jjb/ta/start-menu.yaml index e964eb5..a3bce61 100644 --- a/jjb/ta/start-menu.yaml +++ b/jjb/ta/start-menu.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-start-menu-amd64 project: ta/start-menu project-name: ta-start-menu-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/start-menu project-name: ta-start-menu-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/storage.yaml b/jjb/ta/storage.yaml index 1876c9d..ce0ffcf 100644 --- a/jjb/ta/storage.yaml +++ b/jjb/ta/storage.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-storage-amd64 project: ta/storage project-name: ta-storage-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/storage project-name: ta-storage-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master diff --git a/jjb/ta/yarf.yaml b/jjb/ta/yarf.yaml index cb6c7be..ee68f87 100644 --- a/jjb/ta/yarf.yaml +++ b/jjb/ta/yarf.yaml @@ -1,10 +1,11 @@ +--- - project: name: ta-yarf-amd64 project: ta/yarf project-name: ta-yarf-amd64 project-type: - - merge - - verify + - merge + - verify build-node: centos7-builder-2c-1g stream: master jobs: @@ -15,8 +16,8 @@ project: ta/yarf project-name: ta-yarf-arm64 project-type: - - merge - - verify + - merge + - verify build-node: aarch64_build arch: arm64 stream: master -- 2.16.6 From 9d378480b8a3fdfb13acc717b836ac719f8efa48 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Thu, 4 May 2023 12:56:20 -0700 Subject: [PATCH 07/16] Refactor: Cleanup JJB for pre-commit This includes removing the file "static-slaves-ci-jobs", which does not conform to modern naming conventions, and is no longer needed. Change-Id: If1495c79ba85dea00f7a423f3055abee517dce7e Signed-off-by: Eric Ball Signed-off-by: Anil Belur --- jjb/addon-onap/addon-onap.yaml | 2 +- .../airshipinabottle_deploy.yaml | 2 +- .../akraino-5g-mec-templates.yaml | 60 ++-- jjb/akraino-templates/akraino-iec-macros.yaml | 72 ++-- jjb/akraino-templates/akraino-iec-templates.yaml | 160 ++++----- jjb/akraino-templates/akraino-jjb-docker.yaml | 76 ++-- jjb/akraino-templates/akraino-jjb-kni.yaml | 150 ++++---- jjb/akraino-templates/akraino-jjb-macros.yaml | 17 +- jjb/akraino-templates/akraino-jjb-templates.yaml | 269 +++++++-------- jjb/akraino-templates/akraino-rec-macros.yaml | 40 ++- jjb/akraino-templates/akraino-rec-templates.yaml | 77 ++--- .../akraino-ta-common-macros.yaml | 383 ++++++++++----------- .../akraino-ta-common-templates.yaml | 216 ++++++------ jjb/akraino-templates/akraino-usecase-macros.yaml | 16 +- .../akraino-usecase-templates.yaml | 51 ++- .../akraino-validation-macros.yaml | 56 ++- .../akraino-validation-templates.yaml | 117 ++++--- jjb/camunda_workflow/camunda_workflow-docker.yaml | 8 +- jjb/camunda_workflow/camunda_workflow.yaml | 12 +- jjb/ci-management/ci-jobs.yaml | 2 +- jjb/ci-management/static-slaves-ci-jobs.yaml | 18 - jjb/common-views.yaml | 8 +- jjb/defaults.yaml | 4 +- jjb/icn/icn-daaas.yaml | 2 +- jjb/iec/iec-verify-jobs.yaml | 10 +- jjb/iec/iec.yaml | 22 +- jjb/kni/kni_installer.yaml | 10 +- jjb/nc/nc-ovs-dpdk-unicycle.yaml | 2 +- .../portal-onapsdk-docker.yaml | 10 +- jjb/portal_user_interface/portal-onapsdk.yaml | 20 +- .../portal_user_interface-docker.yaml | 8 +- .../portal_user_interface.yaml | 12 +- jjb/postgres_db_schema/postgres_db_schema.yaml | 8 +- jjb/rec/rec.yaml | 6 +- jjb/redfish/redfish-docker.yaml | 8 +- jjb/redfish/redfish.yaml | 2 +- jjb/regional_controller/api-server-docker.yaml | 10 +- jjb/regional_controller/api-server.yaml | 14 +- jjb/regional_controller/regional_controller.yaml | 2 +- jjb/sample_vnf/sample_vnf.yaml | 2 +- jjb/starlingx/starlingx.yaml | 2 +- jjb/test_automation/test_automation.yaml | 2 +- jjb/validation/bluval.yaml | 4 +- jjb/validation/lab.yaml | 4 +- jjb/validation/validation-docker.yaml | 23 +- jjb/validation/validation-verify-jobs.yaml | 6 +- jjb/validation/validation.yaml | 2 +- jjb/yaml_builds/yaml_builds.yaml | 2 +- packer/provision/helm.yaml | 6 +- 49 files changed, 992 insertions(+), 1023 deletions(-) delete mode 100644 jjb/ci-management/static-slaves-ci-jobs.yaml diff --git a/jjb/addon-onap/addon-onap.yaml b/jjb/addon-onap/addon-onap.yaml index 9f49573..c5b26af 100644 --- a/jjb/addon-onap/addon-onap.yaml +++ b/jjb/addon-onap/addon-onap.yaml @@ -29,4 +29,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml b/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml index ea35e04..0ec2cf1 100644 --- a/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml +++ b/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml @@ -29,4 +29,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/akraino-templates/akraino-5g-mec-templates.yaml b/jjb/akraino-templates/akraino-5g-mec-templates.yaml index 95cbdb0..423e2b5 100644 --- a/jjb/akraino-templates/akraino-5g-mec-templates.yaml +++ b/jjb/akraino-templates/akraino-5g-mec-templates.yaml @@ -1,7 +1,7 @@ --- - job-template: id: 5g-mec-project-stream-verify - name: '{project-name}-{stream}-verify' + name: "{project-name}-{stream}-verify" archive-artifacts: > **/*.log build-days-to-keep: 30 @@ -9,66 +9,66 @@ stream: master project-type: freestyle submodule-recursive: true - node: '{build-node}' + node: "{build-node}" properties: - lf-infra-properties: - build-days-to-keep: '{build-days-to-keep}' + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - lftools-version: '{lftools-version}' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + lftools-version: "{lftools-version}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false - choosing-strategy: 'gerrit' + choosing-strategy: "gerrit" triggers: - gerrit: - server-name: '{gerrit-server-name}' + server-name: "{gerrit-server-name}" trigger-on: - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' + exclude-drafts: "false" + exclude-trivial-rebase: "false" + exclude-no-code-change: "false" - change-merged-event - draft-published-event - comment-added-contains-event: - comment-contains-value: 'recheck' + comment-contains-value: "recheck" - comment-added-contains-event: - comment-contains-value: 'reverify' + comment-contains-value: "reverify" projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' + - project-compare-type: "ANT" + project-pattern: "{project}" branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'true' + - branch-compare-type: "ANT" + branch-pattern: "**/{branch}" + disable-strict-forbidden-file-verification: "true" forbidden-file-paths: - compare-type: ANT - pattern: 'docs/**' + pattern: "docs/**" - compare-type: REG_EXP - pattern: 'INFO.yaml' + pattern: "INFO.yaml" readable-message: true builders: diff --git a/jjb/akraino-templates/akraino-iec-macros.yaml b/jjb/akraino-templates/akraino-iec-macros.yaml index 950d867..502a5eb 100644 --- a/jjb/akraino-templates/akraino-iec-macros.yaml +++ b/jjb/akraino-templates/akraino-iec-macros.yaml @@ -3,87 +3,87 @@ # PARAMETERS # ############## - parameter: - name: 'iec-defaults' + name: "iec-defaults" parameters: - string: name: INSTALLER_IP - default: '10.20.0.2' - description: 'IP of the installer' + default: "10.20.0.2" + description: "IP of the installer" - string: name: SSH_KEY - default: '/var/lib/opnfv/mcp.rsa' - description: 'Path to private SSH key to access environment nodes' + default: "/var/lib/opnfv/mcp.rsa" + description: "Path to private SSH key to access environment nodes" - string: name: EXTERNAL_NETWORK - default: 'floating_net' - description: 'external network for test' + default: "floating_net" + description: "external network for test" - string: name: CI_DEBUG - default: 'false' - description: 'Show debug output information' + default: "false" + description: "Show debug output information" - string: name: ARCHIVE_ARTIFACTS - default: '**/*.log' + default: "**/*.log" description: Artifacts to archive to the logs server. # Usecase params are both installer and OS specific - parameter: &k8s_fuel_ubuntu1804_parameter - name: 'fuel-ubuntu1804-parameters' + name: "fuel-ubuntu1804-parameters" parameters: - string: &k8s_master_ip name: K8S_MASTER_IP - default: '172.16.10.36' - description: 'IP address to connect to the K8s master' + default: "172.16.10.36" + description: "IP address to connect to the K8s master" - string: &k8s_ssh_user name: K8S_SSH_USER - default: 'ubuntu' - description: 'SSH username to connect to the K8s master ' + default: "ubuntu" + description: "SSH username to connect to the K8s master " - string: &k8s_ssh_password name: K8S_SSH_PASSWORD - default: '' - description: 'SSH password to connect to the K8s master' + default: "" + description: "SSH password to connect to the K8s master" - string: &k8s_ssh_key name: K8S_SSH_KEY - default: '/var/lib/opnfv/mcp.rsa' - description: 'SSH key to connect to the K8s master' + default: "/var/lib/opnfv/mcp.rsa" + description: "SSH key to connect to the K8s master" - parameter: <<: *k8s_fuel_ubuntu1804_parameter - name: 'fuel-ubuntu1804-defaults' + name: "fuel-ubuntu1804-defaults" - parameter: - name: 'fuel-centos7-defaults' + name: "fuel-centos7-defaults" parameters: - string: <<: *k8s_master_ip - string: <<: *k8s_ssh_user - default: 'centos' + default: "centos" - string: <<: *k8s_ssh_password - string: <<: *k8s_ssh_key - parameter: - name: 'compass-ubuntu1804-defaults' + name: "compass-ubuntu1804-defaults" parameters: - string: <<: *k8s_master_ip - default: '10.1.0.50' + default: "10.1.0.50" - string: <<: *k8s_ssh_user - default: 'root' + default: "root" - string: <<: *k8s_ssh_password - default: 'root' + default: "root" - string: <<: *k8s_ssh_key - default: '' + default: "" ######################## # publisher macros ######################## - publisher: - name: 'iec-default-publisher' + name: "iec-default-publisher" publishers: - email: recipients: armband@enea.com @@ -97,18 +97,18 @@ # Akraino IEC CI Baremetal Triggers running against master branch # ---------------------------------------------------------------- - trigger: - name: 'iec-type2-fuel-virtual-ubuntu1804-daily-master-trigger' + name: "iec-type2-fuel-virtual-ubuntu1804-daily-master-trigger" triggers: - - timed: '0 1 * * 2,6' + - timed: "0 1 * * 2,6" - trigger: - name: 'iec-type2-fuel-baremetal-ubuntu1804-daily-master-trigger' + name: "iec-type2-fuel-baremetal-ubuntu1804-daily-master-trigger" triggers: - - timed: '0 1 * * *' + - timed: "0 1 * * *" - trigger: - name: 'iec-type2-fuel-virtual-centos7-daily-master-trigger' + name: "iec-type2-fuel-virtual-centos7-daily-master-trigger" triggers: - - timed: '0 1 * * 4,7' + - timed: "0 1 * * 4,7" - trigger: - name: 'iec-type1-compass-virtual-ubuntu1804-daily-master-trigger' + name: "iec-type1-compass-virtual-ubuntu1804-daily-master-trigger" triggers: - - timed: '0 19 * * *' + - timed: "0 19 * * *" diff --git a/jjb/akraino-templates/akraino-iec-templates.yaml b/jjb/akraino-templates/akraino-iec-templates.yaml index a3bfa34..6f732ec 100644 --- a/jjb/akraino-templates/akraino-iec-templates.yaml +++ b/jjb/akraino-templates/akraino-iec-templates.yaml @@ -1,54 +1,53 @@ --- - job-template: id: akraino-iec-install - name: 'iec-{iecType}-{installer}-{deploy_type}-{os}-daily-{stream}' - disabled: '{obj:disabled}' + name: "iec-{iecType}-{installer}-{deploy_type}-{os}-daily-{stream}" + disabled: "{obj:disabled}" concurrent: false - node: '{slave_label}' + node: "{slave_label}" properties: - throttle: enabled: true max-total: 4 max-per-node: 1 - option: 'project' + option: "project" - build-blocker: use-build-blocker: true blocking-jobs: - - '.*-fuel-{deploy_type}-.*' - - '.*-compass-{deploy_type}-.*' - block-level: 'NODE' + - ".*-fuel-{deploy_type}-.*" + - ".*-compass-{deploy_type}-.*" + block-level: "NODE" wrappers: - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO $IEC_TYPE' + name: "$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO $IEC_TYPE" triggers: - - 'iec-{iecType}-{installer}-{deploy_type}-{os}-daily-{stream}-trigger' + - "iec-{iecType}-{installer}-{deploy_type}-{os}-daily-{stream}-trigger" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - - '{project}-defaults' - - '{installer}-{os}-defaults' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + - "{project}-defaults" + - "{installer}-{os}-defaults" - string: name: DEPLOY_SCENARIO - default: '{scenario}' + default: "{scenario}" - string: name: IEC_TYPE - default: '{iecType}' + default: "{iecType}" builders: - trigger-builds: - - project: 'iec-{iecType}-deploy-{installer}-{deploy_type}-{os}-daily-{stream}' + - project: "iec-{iecType}-deploy-{installer}-{deploy_type}-{os}-daily-{stream}" current-parameters: true - predefined-parameters: - DEPLOY_SCENARIO={scenario} + predefined-parameters: DEPLOY_SCENARIO={scenario} same-node: true block: true - trigger-builds: - - project: 'validation-enea-daily-{stream}' + - project: "validation-enea-daily-{stream}" same-node: true current-parameters: true predefined-parameters: | @@ -61,29 +60,27 @@ OPTIONAL=false PULL=yes block: true - - project: - !j2: | - {%- if deploy_type not in ['virtual'] -%} - {%- for uc in usecase -%} - {%- for ph in phase -%} - iec-{{ iecType }}-{{ ph }}-{{ uc }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }} - {%- if not loop.last -%},{%- endif -%} - {%- endfor %} - {%- if not loop.last -%},{%- endif -%} - {%- endfor %} - {%- endif -%} + - project: !j2: | + {%- if deploy_type not in ['virtual'] -%} + {%- for uc in usecase -%} + {%- for ph in phase -%} + iec-{{ iecType }}-{{ ph }}-{{ uc }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }} + {%- if not loop.last -%},{%- endif -%} + {%- endfor %} + {%- if not loop.last -%},{%- endif -%} + {%- endfor %} + {%- endif -%} current-parameters: true same-node: true block: true block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - project: - !j2: | - {%- if deploy_type in ['virtual'] -%} - iec-{{ iecType }}-destroy-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }} - {%- endif -%} + build-step-failure-threshold: "never" + failure-threshold: "never" + unstable-threshold: "FAILURE" + - project: !j2: | + {%- if deploy_type in ['virtual'] -%} + iec-{{ iecType }}-destroy-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }} + {%- endif -%} current-parameters: false predefined-parameters: | DEPLOY_SCENARIO={scenario} @@ -93,52 +90,52 @@ - job-template: id: akraino-iec-deploy - name: 'iec-{iecType}-deploy-{installer}-{deploy_type}-{os}-daily-{stream}' + name: "iec-{iecType}-deploy-{installer}-{deploy_type}-{os}-daily-{stream}" concurrent: true - node: '{slave_label}' + node: "{slave_label}" properties: &properties - throttle: enabled: true max-total: 4 max-per-node: 1 - option: 'project' + option: "project" - build-blocker: use-build-blocker: true blocking-jobs: - - '.*-{iecType}-deploy-{installer}-{deploy_type}-.*' - - '.*-{iecType}-destroy-{installer}-{deploy_type}-.*' - - '.*-{iecType}-install-.*-{installer}-{deploy_type}-.*' - block-level: 'NODE' + - ".*-{iecType}-deploy-{installer}-{deploy_type}-.*" + - ".*-{iecType}-destroy-{installer}-{deploy_type}-.*" + - ".*-{iecType}-install-.*-{installer}-{deploy_type}-.*" + block-level: "NODE" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - - '{project}-defaults' - - '{installer}-{os}-defaults' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + - "{project}-defaults" + - "{installer}-{os}-defaults" - string: name: DEPLOY_SCENARIO - default: '{scenario}' + default: "{scenario}" - string: name: IEC_TYPE - default: '{iecType}' + default: "{iecType}" - string: name: EXTRA_ARGS - default: '-o {os}' + default: "-o {os}" wrappers: &wrappers - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO $IEC_TYPE' + name: "$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO $IEC_TYPE" scm: &scm - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" submodule-recursive: false - submodule-timeout: '{submodule-timeout}' + submodule-timeout: "{submodule-timeout}" submodule-disable: true choosing-strategy: default @@ -147,48 +144,44 @@ description: "POD: $NODE_NAME" - conditional-step: condition-kind: regex-match - regex: 'compass' - label: '{installer}' + regex: "compass" + label: "{installer}" steps: - - shell: - !include-raw-escape: ../iec/iec-compass-build.sh - - shell: - !include-raw-escape: ../iec/iec-compass-deploy.sh - - shell: - !include-raw-escape: ../iec/iec-fdn-install.sh + - shell: !include-raw-escape: ../iec/iec-compass-build.sh + - shell: !include-raw-escape: ../iec/iec-compass-deploy.sh + - shell: !include-raw-escape: ../iec/iec-fdn-install.sh - conditional-step: condition-kind: regex-match - regex: 'fuel' - label: '{installer}' + regex: "fuel" + label: "{installer}" steps: - - shell: - !include-raw-escape: ../iec/iec-fuel-deploy.sh + - shell: !include-raw-escape: ../iec/iec-fuel-deploy.sh publishers: - iec-default-publisher - job-template: id: akraino-iec-destroy - name: 'iec-{iecType}-destroy-{installer}-{deploy_type}-{os}-daily-{stream}' + name: "iec-{iecType}-destroy-{installer}-{deploy_type}-{os}-daily-{stream}" concurrent: true - node: '{slave_label}' + node: "{slave_label}" properties: *properties parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - - '{project}-defaults' - - '{installer}-{os}-defaults' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + - "{project}-defaults" + - "{installer}-{os}-defaults" - string: name: DEPLOY_SCENARIO - default: '{scenario}' + default: "{scenario}" - string: name: IEC_TYPE - default: '{iecType}' + default: "{iecType}" - string: name: EXTRA_ARGS - default: '-EEE -o {os}' + default: "-EEE -o {os}" wrappers: *wrappers scm: *scm @@ -196,8 +189,7 @@ builders: - description-setter: description: "POD: $NODE_NAME" - - shell: - !include-raw-escape: ../iec/iec-{installer}-destroy.sh + - shell: !include-raw-escape: ../iec/iec-{installer}-destroy.sh publishers: - iec-default-publisher diff --git a/jjb/akraino-templates/akraino-jjb-docker.yaml b/jjb/akraino-templates/akraino-jjb-docker.yaml index 8e068d5..8818e0a 100644 --- a/jjb/akraino-templates/akraino-jjb-docker.yaml +++ b/jjb/akraino-templates/akraino-jjb-docker.yaml @@ -15,84 +15,84 @@ # limitations under the License. # - job-template: - id: 'akraino-project-stream-docker' - name: '{project-name}-{stream}-docker' + id: "akraino-project-stream-docker" + name: "{project-name}-{stream}-docker" project-type: freestyle - node: '{build-node}' + node: "{build-node}" parameters: - lf-infra-parameters: - project: '{project}' - branch: '{branch}' - stream: '{stream}' - lftools-version: '{lftools-version}' + project: "{project}" + branch: "{branch}" + stream: "{stream}" + lftools-version: "{lftools-version}" scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: default builders: - lf-update-java-alternatives: - java-version: '{java-version}' + java-version: "{java-version}" - lf-infra-docker-login: - global-settings-file: '{global-settings-file}' - settings-file: '{mvn-settings}' + global-settings-file: "{global-settings-file}" + settings-file: "{mvn-settings}" - inject: properties-content: | - PROJECT={project} + PROJECT={project} - shell: !include-raw-escape: - ../shell/build-docker.sh triggers: - - timed: '@daily' + - timed: "@daily" publishers: - lf-infra-publish - job-template: - id: 'akraino-project-stream-stage-docker' - name: '{project-name}-{stream}-stage-docker' + id: "akraino-project-stream-stage-docker" + name: "{project-name}-{stream}-stage-docker" project-type: freestyle - node: '{build-node}' + node: "{build-node}" parameters: - lf-infra-parameters: - project: '{project}' - branch: '{branch}' - stream: '{stream}' - lftools-version: '{lftools-version}' + project: "{project}" + branch: "{branch}" + stream: "{stream}" + lftools-version: "{lftools-version}" - string: name: STAGING_BUILD - default: 'true' + default: "true" description: Mark this as a staging build. scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: default builders: - lf-update-java-alternatives: - java-version: '{java-version}' + java-version: "{java-version}" - lf-infra-docker-login: - global-settings-file: '{global-settings-file}' - settings-file: '{mvn-settings}' + global-settings-file: "{global-settings-file}" + settings-file: "{mvn-settings}" - inject: properties-content: | - PROJECT={project} + PROJECT={project} - shell: !include-raw-escape: - ../shell/get-upstream-autostage.sh - ../shell/build-docker.sh @@ -100,8 +100,8 @@ triggers: - reverse: jobs: - - '{project}-maven-stage-{stream}' - - 'yaml_builds-{stream}-stage-config' + - "{project}-maven-stage-{stream}" + - "yaml_builds-{stream}-stage-config" publishers: - lf-infra-publish diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml index a9fc7d9..2e396bc 100644 --- a/jjb/akraino-templates/akraino-jjb-kni.yaml +++ b/jjb/akraino-templates/akraino-jjb-kni.yaml @@ -57,28 +57,28 @@ node: "{build-node}" properties: - lf-infra-properties: - build-days-to-keep: '{build-days-to-keep}' + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - branch: '{branch}' - stream: '{stream}' - lftools-version: '{lftools-version}' + project: "{project}" + branch: "{branch}" + stream: "{stream}" + lftools-version: "{lftools-version}" wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: gerrit @@ -93,15 +93,15 @@ triggers: - gerrit: - server-name: '{gerrit-server-name}' - trigger-on: '{obj:gerrit_verify_triggers}' + server-name: "{gerrit-server-name}" + trigger-on: "{obj:gerrit_verify_triggers}" projects: - project-compare-type: ANT - project-pattern: '{project}' + project-pattern: "{project}" branches: - branch-compare-type: ANT - branch-pattern: '**/{branch}' - file-paths: '{obj:gerrit_trigger_file_paths}' + branch-pattern: "**/{branch}" + file-paths: "{obj:gerrit_trigger_file_paths}" publishers: - lf-infra-publish @@ -113,44 +113,44 @@ parameters: - lf-infra-parameters: - project: '{project}' - branch: '{branch}' - stream: '{stream}' - lftools-version: '{lftools-version}' + project: "{project}" + branch: "{branch}" + stream: "{stream}" + lftools-version: "{lftools-version}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" - credentials-binding: - ssh-user-private-key: credential-id: kni-secrets key-file-variable: KNI_KEY_PATH scm: - akraino-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: gerrit - basedir: '{project-name}' + basedir: "{project-name}" - akraino-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/kni/installer.git' - refspec: 'refs/heads/master' - branch: 'master' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/kni/installer.git" + refspec: "refs/heads/master" + branch: "master" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: default - basedir: 'installer' + basedir: "installer" publishers: - postbuildscript: @@ -174,10 +174,10 @@ - job-template: id: kni-installer-verify-installer - name: '{project-name}-verify-installer' + name: "{project-name}-verify-installer" gerrit_trigger_file_paths: - compare-type: ANT - pattern: '**' + pattern: "**" <<: *kni_common build-node: centos7-builder-2c-1g @@ -190,17 +190,17 @@ - job-template: id: kni-verify-deploy-aws - name: 'kni-{project-name}-verify-deploy-aws' + name: "kni-{project-name}-verify-deploy-aws" build-node: kni-cloud <<: *kni_common_deploy gerrit_trigger_file_paths: - compare-type: ANT - pattern: 'profiles/production.aws/**' + pattern: "profiles/production.aws/**" - compare-type: ANT - pattern: 'sites/testing.aws.edge-sites.net/**' + pattern: "sites/testing.aws.edge-sites.net/**" - compare-type: ANT - pattern: 'base/**' + pattern: "base/**" builders: - lf-infra-pre-build @@ -214,18 +214,18 @@ - job-template: id: kni-verify-deploy-gcp - name: 'kni-{project-name}-verify-deploy-gcp' + name: "kni-{project-name}-verify-deploy-gcp" site: edge-sites-testing.gcp.devcluster.openshift.com build-node: kni-cloud <<: *kni_common_deploy gerrit_trigger_file_paths: - compare-type: ANT - pattern: 'profiles/production.gcp/**' + pattern: "profiles/production.gcp/**" - compare-type: ANT - pattern: 'sites/edge-sites-testing.gcp.devcluster.openshift.com/**' + pattern: "sites/edge-sites-testing.gcp.devcluster.openshift.com/**" - compare-type: ANT - pattern: 'base/**' + pattern: "base/**" builders: - lf-infra-pre-build @@ -239,18 +239,18 @@ - job-template: id: kni-verify-deploy-gcp-hub - name: 'kni-{project-name}-verify-deploy-gcp' + name: "kni-{project-name}-verify-deploy-gcp" site: kni-mgmt-hub.gcp.devcluster.openshift.com build-node: kni-cloud <<: *kni_common_deploy gerrit_trigger_file_paths: - compare-type: ANT - pattern: 'profiles/production.gcp/**' + pattern: "profiles/production.gcp/**" - compare-type: ANT - pattern: 'sites/kni-mgmt-hub.gcp.devcluster.openshift.com/**' + pattern: "sites/kni-mgmt-hub.gcp.devcluster.openshift.com/**" - compare-type: ANT - pattern: 'base/**' + pattern: "base/**" builders: - lf-infra-pre-build @@ -264,18 +264,18 @@ - job-template: id: kni-verify-deploy-gcp-ie - name: 'kni-{project-name}-verify-deploy-gcp' + name: "kni-{project-name}-verify-deploy-gcp" site: kni-ie.gcp.devcluster.openshift.com build-node: kni-cloud <<: *kni_common_deploy gerrit_trigger_file_paths: - compare-type: ANT - pattern: 'profiles/production.gcp/**' + pattern: "profiles/production.gcp/**" - compare-type: ANT - pattern: 'sites/kni-ie.gcp.devcluster.openshift.com/**' + pattern: "sites/kni-ie.gcp.devcluster.openshift.com/**" - compare-type: ANT - pattern: 'base/**' + pattern: "base/**" builders: - lf-infra-pre-build @@ -289,40 +289,40 @@ - job-template: id: kni-verify-deploy-baremetal - name: 'kni-{project-name}-verify-deploy-baremetal' + name: "kni-{project-name}-verify-deploy-baremetal" <<: *kni_common_deploy build-timeout: 120 build-node: kni-baremetal gerrit_trigger_file_paths: - compare-type: ANT - pattern: 'profiles/production.baremetal/**' + pattern: "profiles/production.baremetal/**" - compare-type: ANT - pattern: 'sites/testing.baremetal.edge-sites.net/**' + pattern: "sites/testing.baremetal.edge-sites.net/**" - compare-type: ANT - pattern: 'base/**' + pattern: "base/**" scm: - akraino-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: 'https://gerrit.akraino.org/r/kni/blueprint-pae' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "https://gerrit.akraino.org/r/kni/blueprint-pae" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: gerrit - basedir: 'kni-blueprint-pae' + basedir: "kni-blueprint-pae" - akraino-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/kni/installer.git' - refspec: 'refs/heads/master' - branch: 'master' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/kni/installer.git" + refspec: "refs/heads/master" + branch: "master" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: default - basedir: 'installer' + basedir: "installer" builders: - lf-infra-pre-build diff --git a/jjb/akraino-templates/akraino-jjb-macros.yaml b/jjb/akraino-templates/akraino-jjb-macros.yaml index 639e632..57e72de 100644 --- a/jjb/akraino-templates/akraino-jjb-macros.yaml +++ b/jjb/akraino-templates/akraino-jjb-macros.yaml @@ -1,17 +1,18 @@ +--- - scm: # enhanced version of the global-jjb, based on ta-common-macros name: akraino-lf-infra-gerrit-scm scm: - git: - credentials-id: '{jenkins-ssh-credential}' - url: '{git-url}' - refspec: '{refspec}' + credentials-id: "{jenkins-ssh-credential}" + url: "{git-url}" + refspec: "{refspec}" branches: - - 'refs/heads/{branch}' + - "refs/heads/{branch}" skip-tag: true wipe-workspace: true submodule: - recursive: '{submodule-recursive}' - timeout: '{submodule-timeout}' - choosing-strategy: '{choosing-strategy}' - basedir: '{basedir}' + recursive: "{submodule-recursive}" + timeout: "{submodule-timeout}" + choosing-strategy: "{choosing-strategy}" + basedir: "{basedir}" diff --git a/jjb/akraino-templates/akraino-jjb-templates.yaml b/jjb/akraino-templates/akraino-jjb-templates.yaml index b320852..4975463 100644 --- a/jjb/akraino-templates/akraino-jjb-templates.yaml +++ b/jjb/akraino-templates/akraino-jjb-templates.yaml @@ -16,7 +16,7 @@ # - job-template: id: akraino-project-stream-release-config - name: '{project-name}-{stream}-release-config' + name: "{project-name}-{stream}-release-config" ###################### # Default parameters # @@ -31,14 +31,14 @@ build-days-to-keep: 30 build-timeout: 60 java-version: openjdk8 - maven-repo-url: '$NEXUS_URL/content/repositories/snapshots' + maven-repo-url: "$NEXUS_URL/content/repositories/snapshots" mvn-global-settings: global-settings - mvn-opts: '' - mvn-params: '' + mvn-opts: "" + mvn-params: "" mvn-version: mvn35 nexus-shapshot-repo: snapshots repo-id: snapshots - staging-profile-id: '' # Unused by this job. + staging-profile-id: "" # Unused by this job. stream: master submodule-recursive: true upload-files-dir: /tmp/tardir @@ -48,37 +48,37 @@ ##################### project-type: freestyle - node: '{build-node}' + node: "{build-node}" properties: - lf-infra-properties: - build-days-to-keep: '{build-days-to-keep}' + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - branch: '{branch}' - stream: '{stream}' - lftools-version: '{lftools-version}' + project: "{project}" + branch: "{branch}" + stream: "{stream}" + lftools-version: "{lftools-version}" - lf-infra-maven-parameters: - mvn-opts: '{mvn-opts}' - mvn-params: '{mvn-params}' - mvn-version: '{mvn-version}' + mvn-opts: "{mvn-opts}" + mvn-params: "{mvn-params}" + mvn-version: "{mvn-version}" # Staging repos do not make sense for CLM jobs so set it blank. - staging-profile-id: '{staging-profile-id}' + staging-profile-id: "{staging-profile-id}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. - string: name: UPLOAD_FILES_PATH - default: '{upload-files-dir}' + default: "{upload-files-dir}" description: File path to generate tarball and upload to repository. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" gerrit_merge_triggers: - change-merged-event @@ -87,59 +87,58 @@ gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: '.*' + pattern: ".*" scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '{refspec}' - branch: '{branch}' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "{refspec}" + branch: "{branch}" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: default triggers: - - timed: '{obj:cron}' + - timed: "{obj:cron}" - gerrit: - server-name: '{gerrit-server-name}' - trigger-on: '{obj:gerrit_merge_triggers}' + server-name: "{gerrit-server-name}" + trigger-on: "{obj:gerrit_merge_triggers}" projects: - project-compare-type: ANT - project-pattern: '{project}' + project-pattern: "{project}" branches: - branch-compare-type: ANT - branch-pattern: '**/{branch}' - file-paths: '{obj:gerrit_trigger_file_paths}' + branch-pattern: "**/{branch}" + file-paths: "{obj:gerrit_trigger_file_paths}" builders: - lf-infra-pre-build - lf-maven-install: - mvn-version: '{mvn-version}' + mvn-version: "{mvn-version}" - lf-update-java-alternatives: - java-version: '{java-version}' + java-version: "{java-version}" - lf-provide-maven-settings: - global-settings-file: '{mvn-global-settings}' - settings-file: '{mvn-settings}' + global-settings-file: "{mvn-global-settings}" + settings-file: "{mvn-settings}" - shell: !include-raw-escape: - ../shell/make-tar.sh - lf-infra-deploy-maven-file: - global-settings-file: '{mvn-global-settings}' - settings-file: '{mvn-settings}' - mvn-version: '{mvn-version}' - repo-id: '{repo-id}' - group-id: '{group-id}' - upload-files-dir: '{upload-files-dir}' - maven-repo-url: '{maven-repo-url}' + global-settings-file: "{mvn-global-settings}" + settings-file: "{mvn-settings}" + mvn-version: "{mvn-version}" + repo-id: "{repo-id}" + group-id: "{group-id}" + upload-files-dir: "{upload-files-dir}" + maven-repo-url: "{maven-repo-url}" publishers: - lf-infra-publish - - job-template: id: akraino-project-stream-stage-config - name: '{project-name}-{stream}-stage-config' + name: "{project-name}-{stream}-stage-config" ###################### # Default parameters # @@ -153,111 +152,111 @@ **/target/surefire-reports/*-output.txt build-days-to-keep: 14 build-timeout: 60 - cron: '@daily' + cron: "@daily" disable-job: false - git-url: '$GIT_URL/$PROJECT' - github-url: 'https://github.com' + git-url: "$GIT_URL/$PROJECT" + github-url: "https://github.com" java-version: openjdk8 mvn-global-settings: global-settings mvn-goals: clean deploy - mvn-opts: '' - mvn-params: '' + mvn-opts: "" + mvn-params: "" mvn-version: mvn35 sign-artifacts: false stream: master submodule-recursive: true - upload-files-dir: m2repo # expected by "lftools deploy nexus-stage" + upload-files-dir: m2repo # expected by "lftools deploy nexus-stage" ##################### # Job Configuration # ##################### project-type: freestyle - node: '{build-node}' + node: "{build-node}" properties: - lf-infra-properties: - build-days-to-keep: '{build-days-to-keep}' + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - branch: '{branch}' - stream: '{stream}' - lftools-version: '{lftools-version}' + project: "{project}" + branch: "{branch}" + stream: "{stream}" + lftools-version: "{lftools-version}" - lf-infra-maven-parameters: - mvn-opts: '{mvn-opts}' - mvn-params: '{mvn-params}' - mvn-version: '{mvn-version}' - staging-profile-id: '{staging-profile-id}' + mvn-opts: "{mvn-opts}" + mvn-params: "{mvn-params}" + mvn-version: "{mvn-version}" + staging-profile-id: "{staging-profile-id}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. - string: name: UPLOAD_FILES_PATH - default: '{upload-files-dir}' + default: "{upload-files-dir}" description: File path to generate tarball and upload to repository. - string: name: STAGING_PROFILE_ID - default: '{staging-profile-id}' + default: "{staging-profile-id}" description: Nexus staging profile ID. - string: name: STAGING_BUILD - default: 'true' + default: "true" description: Mark this as a staging build. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" gerrit_release_triggers: - comment-added-contains-event: comment-contains-value: stage-release$ - disabled: '{disable-job}' + disabled: "{disable-job}" scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: default triggers: - - timed: '{obj:cron}' + - timed: "{obj:cron}" - gerrit: - server-name: '{gerrit-server-name}' - trigger-on: '{obj:gerrit_release_triggers}' + server-name: "{gerrit-server-name}" + trigger-on: "{obj:gerrit_release_triggers}" projects: - project-compare-type: ANT - project-pattern: '{project}' + project-pattern: "{project}" branches: - branch-compare-type: ANT - branch-pattern: '**/{branch}' + branch-pattern: "**/{branch}" builders: - lf-infra-pre-build - lf-jacoco-nojava-workaround - lf-maven-install: - mvn-version: '{mvn-version}' + mvn-version: "{mvn-version}" - lf-update-java-alternatives: - java-version: '{java-version}' + java-version: "{java-version}" - lf-provide-maven-settings: - global-settings-file: '{mvn-global-settings}' - settings-file: '{mvn-settings}' + global-settings-file: "{mvn-global-settings}" + settings-file: "{mvn-settings}" - lf-infra-create-netrc: - server-id: '{mvn-staging-id}' + server-id: "{mvn-staging-id}" - shell: !include-raw-escape: - ../shell/make-tar.sh - lf-sigul-sign-dir: - sign-artifacts: '{sign-artifacts}' - sign-dir: '$WORKSPACE/m2repo' + sign-artifacts: "{sign-artifacts}" + sign-dir: "$WORKSPACE/m2repo" sign-mode: serial - lf-maven-stage - lf-provide-maven-settings-cleanup @@ -267,7 +266,7 @@ - job-template: id: akraino-project-stream-verify - name: '{project-name}-{stream}-verify' + name: "{project-name}-{stream}-verify" archive-artifacts: > **/*.log build-days-to-keep: 30 @@ -275,67 +274,67 @@ stream: master project-type: freestyle submodule-recursive: true - node: '{build-node}' + node: "{build-node}" properties: - lf-infra-properties: - build-days-to-keep: '{build-days-to-keep}' + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - lftools-version: '{lftools-version}' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + lftools-version: "{lftools-version}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false - choosing-strategy: 'gerrit' + choosing-strategy: "gerrit" triggers: - gerrit: - server-name: '{gerrit-server-name}' + server-name: "{gerrit-server-name}" trigger-on: - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' + exclude-drafts: "false" + exclude-trivial-rebase: "false" + exclude-no-code-change: "false" - change-merged-event - draft-published-event - comment-added-contains-event: - comment-contains-value: 'recheck' + comment-contains-value: "recheck" - comment-added-contains-event: - comment-contains-value: 'reverify' + comment-contains-value: "reverify" projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' + - project-compare-type: "ANT" + project-pattern: "{project}" branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' + - branch-compare-type: "ANT" + branch-pattern: "**/{branch}" file-paths: - compare-type: ANT - pattern: '**/*' - disable-strict-forbidden-file-verification: 'true' + pattern: "**/*" + disable-strict-forbidden-file-verification: "true" forbidden-file-paths: - compare-type: ANT - pattern: 'docs/**' + pattern: "docs/**" readable-message: true builders: @@ -347,20 +346,20 @@ - job-template: id: akraino-project-build-node-init - name: '{project-name}-{build-node}-init' + name: "{project-name}-{build-node}-init" # disable_job: false - disabled: '{obj:disable_job}' + disabled: "{obj:disable_job}" concurrent: true parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' + project: "{project}" + stream: "{stream}" + branch: "{branch}" - label: - name: '{build-node}' - default: '{build-node}' - node-eligibility: 'all' + name: "{build-node}" + default: "{build-node}" + node-eligibility: "all" all-nodes: true gerrit_merge_triggers: @@ -370,30 +369,30 @@ gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: 'global-jjb' + pattern: "global-jjb" scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" submodule-recursive: true - submodule-timeout: '{submodule-timeout}' + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: default triggers: - gerrit: - server-name: '{gerrit-server-name}' - trigger-on: '{obj:gerrit_merge_triggers}' + server-name: "{gerrit-server-name}" + trigger-on: "{obj:gerrit_merge_triggers}" projects: - project-compare-type: ANT - project-pattern: '{project}' + project-pattern: "{project}" branches: - branch-compare-type: ANT - branch-pattern: '**/{branch}' - file-paths: '{obj:gerrit_trigger_file_paths}' + branch-pattern: "**/{branch}" + file-paths: "{obj:gerrit_trigger_file_paths}" builders: - description-setter: diff --git a/jjb/akraino-templates/akraino-rec-macros.yaml b/jjb/akraino-templates/akraino-rec-macros.yaml index a1129b8..ad2312a 100644 --- a/jjb/akraino-templates/akraino-rec-macros.yaml +++ b/jjb/akraino-templates/akraino-rec-macros.yaml @@ -3,49 +3,51 @@ # PARAMETERS # ############## - parameter: - name: 'rec-aarch64_baremetal-defaults' + name: "rec-aarch64_baremetal-defaults" parameters: - string: name: REC_ISO_IMAGE_NAME - default: 'https://nexus.akraino.org/content/repositories/images-snapshots/TA/images/arm64/latest/install.aarch64.iso' - description: 'REC install image' + # yamllint disable-line rule:line-length + default: "https://nexus.akraino.org/content/repositories/images-snapshots/TA/images/arm64/latest/install.aarch64.iso" + description: "REC install image" - string: name: REC_PROVISIONING_ISO_NAME - default: 'https://nexus.akraino.org/content/repositories/images-snapshots/TA/images/arm64/latest/bootcd.aarch64.iso' - description: 'REC provisioning image' + # yamllint disable-line rule:line-length + default: "https://nexus.akraino.org/content/repositories/images-snapshots/TA/images/arm64/latest/bootcd.aarch64.iso" + description: "REC provisioning image" - string: name: REC_USER_CONFIG - default: 'file:///data/rec_pod/user_config.yaml' - description: 'POD user config YAML (hosted on Jumpserver by default)' + default: "file:///data/rec_pod/user_config.yaml" + description: "POD user config YAML (hosted on Jumpserver by default)" - string: name: ARCHIVE_ARTIFACTS - default: '**/*.log' + default: "**/*.log" description: Artifacts to archive to the logs server. - string: name: SCM_REFSPEC_REMOTE_INSTALLER - default: 'refs/heads/master' - description: 'remote-installer custom git refspec' + default: "refs/heads/master" + description: "remote-installer custom git refspec" - parameter: - name: 'rec-defaults' + name: "rec-defaults" parameters: - string: name: CLUSTER_MASTER_IP - default: '192.167.10.211' - description: 'IP address to connect to the K8s master' + default: "192.167.10.211" + description: "IP address to connect to the K8s master" - string: name: CLUSTER_SSH_USER - default: 'cloudadmin' - description: 'SSH username to connect to the K8s master' + default: "cloudadmin" + description: "SSH username to connect to the K8s master" - string: name: CLUSTER_SSH_PASSWORD - default: 'admin' - description: 'SSH password to connect to the K8s master' + default: "admin" + description: "SSH password to connect to the K8s master" ######################## # trigger macros ######################## - trigger: - name: 'rec-weekly-master-trigger' + name: "rec-weekly-master-trigger" triggers: - - timed: '0 1 * * 6,7' + - timed: "0 1 * * 6,7" diff --git a/jjb/akraino-templates/akraino-rec-templates.yaml b/jjb/akraino-templates/akraino-rec-templates.yaml index b92d8e4..883f26c 100644 --- a/jjb/akraino-templates/akraino-rec-templates.yaml +++ b/jjb/akraino-templates/akraino-rec-templates.yaml @@ -1,42 +1,42 @@ --- - job-template: id: akraino-rec-deploy - name: 'rec-{slave_label}-{job_frequency}-{stream}' - disabled: '{obj:disabled}' + name: "rec-{slave_label}-{job_frequency}-{stream}" + disabled: "{obj:disabled}" concurrent: false - node: '{slave_label}' + node: "{slave_label}" properties: - throttle: enabled: true max-total: 4 max-per-node: 1 - option: 'project' + option: "project" wrappers: - build-name: - name: '$BUILD_NUMBER - Install REC Blueprint' + name: "$BUILD_NUMBER - Install REC Blueprint" triggers: - - 'rec-{job_frequency}-{stream}-trigger' + - "rec-{job_frequency}-{stream}-trigger" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - - 'rec-{slave_label}-defaults' - - 'rec-defaults' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + - "rec-{slave_label}-defaults" + - "rec-defaults" builders: - description-setter: description: "SLAVE: $NODE_NAME" - trigger-builds: - - project: 'rec-{slave_label}-install-rec-{job_frequency}-{stream}' + - project: "rec-{slave_label}-install-rec-{job_frequency}-{stream}" current-parameters: true same-node: true block: true - trigger-builds: - - project: 'validation-unh-daily-{stream}' + - project: "validation-unh-daily-{stream}" same-node: true current-parameters: true predefined-parameters: | @@ -45,22 +45,21 @@ OPTIONAL=false PULL=yes block: true - - project: - !j2: | - {%- for uc in usecase -%} - {%- for ph in phase -%} - rec-{{ slave_label }}-{{ ph }}-{{ uc }}-{{ job_frequency }}-{{ stream }} - {%- if not loop.last -%},{%- endif -%} - {%- endfor %} - {%- if not loop.last -%},{%- endif -%} - {%- endfor %} + - project: !j2: | + {%- for uc in usecase -%} + {%- for ph in phase -%} + rec-{{ slave_label }}-{{ ph }}-{{ uc }}-{{ job_frequency }}-{{ stream }} + {%- if not loop.last -%},{%- endif -%} + {%- endfor %} + {%- if not loop.last -%},{%- endif -%} + {%- endfor %} current-parameters: true same-node: true block: true block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' + build-step-failure-threshold: "never" + failure-threshold: "never" + unstable-threshold: "FAILURE" publishers: &rec-publishers - email: @@ -69,34 +68,34 @@ - job-template: id: akraino-rec-install-rec - name: 'rec-{slave_label}-install-rec-{job_frequency}-{stream}' + name: "rec-{slave_label}-install-rec-{job_frequency}-{stream}" concurrent: true - node: '{slave_label}' + node: "{slave_label}" properties: - throttle: enabled: true max-total: 4 max-per-node: 1 - option: 'project' + option: "project" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - - 'rec-{slave_label}-defaults' - - 'rec-defaults' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + - "rec-{slave_label}-defaults" + - "rec-defaults" scm: - ta-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/ta/remote-installer.git' - branch: '{branch}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/ta/remote-installer.git" + branch: "{branch}" submodule-recursive: false submodule-timeout: 10 - choosing-strategy: 'gerrit' - basedir: 'git/remote-installer' - refspec: '$SCM_REFSPEC_REMOTE_INSTALLER' + choosing-strategy: "gerrit" + basedir: "git/remote-installer" + refspec: "$SCM_REFSPEC_REMOTE_INSTALLER" builders: - description-setter: description: "SLAVE: $NODE_NAME" diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml index be0a956..ca444f8 100644 --- a/jjb/akraino-templates/akraino-ta-common-macros.yaml +++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml @@ -1,56 +1,36 @@ --- +# yamllint disable-file ############## # PARAMETERS # ############## - parameter: - name: ta-parameters-manifest + name: ta-parameters parameters: - - string: - default: refs/heads/master - description: '' - name: SCM_REFSPEC_MANIFEST - trim: 'false' - -- parameter: - name: ta-parameters-build-tools - parameters: - - string: - default: refs/heads/master - description: '' - name: SCM_REFSPEC_BUILD_TOOLS - trim: 'false' - -- parameter: - name: ta-parameters-rpmbuilder - parameters: - - string: - default: refs/heads/master - description: '' - name: SCM_REFSPEC_RPMBUILDER - trim: 'false' - -- parameter: - name: ta-parameters-ci - parameters: - - ta-parameters-manifest - - ta-parameters-build-tools - - ta-parameters-rpmbuilder - -- parameter: - name: ta-parameters-ci-ta/rpmbuilder - parameters: - - ta-parameters-manifest - - ta-parameters-build-tools - - string: - default: ta/yarf - description: '' - name: SCM_PROJECT_TO_BUILD - trim: 'false' - - string: - default: refs/heads/master - description: '' - name: SCM_PROJECT_TO_BUILD_REFSPEC - trim: 'false' + - string: + name: SCM_REFSPEC_MANIFEST + default: refs/heads/master + description: "" + trim: "false" + - string: + name: SCM_REFSPEC_BUILD_TOOLS + default: refs/heads/master + description: "" + trim: "false" + - string: + name: SCM_REFSPEC_RPMBUILDER + default: refs/heads/master + description: "" + trim: "false" + - string: + name: SCM_PROJECT_TO_BUILD + default: ta/yarf + description: "" + trim: "false" + - string: + name: SCM_PROJECT_TO_BUILD_REFSPEC + default: refs/heads/master + description: "" + trim: "false" ####### # SCM # @@ -60,43 +40,43 @@ name: ta-lf-infra-gerrit-scm scm: - git: - credentials-id: '{jenkins-ssh-credential}' - url: '{git-url}' - refspec: '{refspec}' + credentials-id: "{jenkins-ssh-credential}" + url: "{git-url}" + refspec: "{refspec}" branches: - - 'refs/heads/{branch}' + - "refs/heads/{branch}" skip-tag: true wipe-workspace: true submodule: - recursive: '{submodule-recursive}' - timeout: '{submodule-timeout}' - choosing-strategy: '{choosing-strategy}' - basedir: '{basedir}' + recursive: "{submodule-recursive}" + timeout: "{submodule-timeout}" + choosing-strategy: "{choosing-strategy}" + basedir: "{basedir}" - scm: name: ta-lf-infra-gerrit-scm-merge scm: - ta-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}' - refspec: '{refspec}' - branch: '{branch}' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' - basedir: '{basedir}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}" + refspec: "{refspec}" + branch: "{branch}" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" + basedir: "{basedir}" choosing-strategy: default - scm: name: ta-lf-infra-gerrit-scm-verify scm: - ta-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}' - refspec: '{refspec}' - branch: '{branch}' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' - basedir: '{basedir}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}" + refspec: "{refspec}" + branch: "{branch}" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" + basedir: "{basedir}" choosing-strategy: gerrit ########### @@ -105,80 +85,81 @@ - builder: name: lf-display-node-uuid builders: - - shell: |2- + # yamllint disable rule:line-length + - shell: |2- echo "---> Node UUID:" curl -s http://169.254.169.254/openstack/latest/meta_data.json | python -c 'import sys, json; data = json.load(sys.stdin); print(data["uuid"])' || true + # yamllint enable rule:line-length - builder: name: ta-builder-tox builders: - - shell: |2- - #!/bin/bash -ex - source ~/lf-env.sh + - shell: |2- + #!/bin/bash -ex + source ~/lf-env.sh - lf-activate-venv tox - tox --version - for f in $(find $GERRIT_PROJECT -name tox.ini); do - pushd $(dirname $f) - tox - popd - done + lf-activate-venv tox + tox --version + for f in $(find $GERRIT_PROJECT -name tox.ini); do + pushd $(dirname $f) + tox + popd + done - builder: name: ta-builder-rpm builders: - - shell: |2- - #!/bin/bash -ex - # Skip RPM build in case no *.spec file is found within the {project-to-build} - if [ -n "$(find {project-to-build} -name '*.spec')" ] - then - if apt --version >/dev/null 2>&1; then - # We need a specific version of mock (1.4.14) and devtools - # not available in Ubuntu/Debian repos, so fetch them from RHEL mirrors - if [ "$(mock --version 2>/dev/null)" != '1.4.14' ]; then - sudo groupadd mock || true - sudo usermod -aG mock $USER - sudo apt update - # Explicitly install mock dependencies - sudo apt install -y createrepo alien systemd-container python-pip \ - python-peak.util.decorators yum-utils usermode pigz - wget http://vault.centos.org/centos/7.6.1810/os/x86_64/Packages/rpmdevtools-8.3-5.el7.noarch.rpm \ - https://kojipkgs.fedoraproject.org/packages/mock/1.4.14/2.el7/noarch/mock-1.4.14-2.el7.noarch.rpm - sudo alien -d *.rpm - sudo dpkg --force-overwrite -i *.deb - rm -rf *.rpm *.deb - # RHEL tools hardcode the full path for certain distro tools - sudo ln -sf /bin/tar /usr/bin/gtar - sudo ln -sf /bin/machinectl /bin/df /usr/bin/ - # Some mock dependencies are only available via pip - sudo pip install distro pyroute2 lxml urllib3 - fi - else - sudo yum install -y createrepo - fi - ta/build-tools/build_rpms.sh \ - -m ta/manifest \ - -r ta/rpmbuilder \ - -w work \ - {project-to-build} - find work/ - fi + - shell: |2- + #!/bin/bash -ex + # Skip RPM build in case no *.spec file is found within the {project-to-build} + if [ -n "$(find {project-to-build} -name '*.spec')" ]; then + if apt --version >/dev/null 2>&1; then + # We need a specific version of mock (1.4.14) and devtools + # not available in Ubuntu/Debian repos, so fetch them from RHEL mirrors + if [ "$(mock --version 2>/dev/null)" != '1.4.14' ]; then + sudo groupadd mock || true + sudo usermod -aG mock $USER + sudo apt update + # Explicitly install mock dependencies + sudo apt install -y createrepo alien systemd-container python-pip \ + python-peak.util.decorators yum-utils usermode pigz + wget http://vault.centos.org/centos/7.6.1810/os/x86_64/Packages/rpmdevtools-8.3-5.el7.noarch.rpm \ + https://kojipkgs.fedoraproject.org/packages/mock/1.4.14/2.el7/noarch/mock-1.4.14-2.el7.noarch.rpm + sudo alien -d *.rpm + sudo dpkg --force-overwrite -i *.deb + rm -rf *.rpm *.deb + # RHEL tools hardcode the full path for certain distro tools + sudo ln -sf /bin/tar /usr/bin/gtar + sudo ln -sf /bin/machinectl /bin/df /usr/bin/ + # Some mock dependencies are only available via pip + sudo pip install distro pyroute2 lxml urllib3 + fi + else + sudo yum install -y createrepo + fi + ta/build-tools/build_rpms.sh \ + -m ta/manifest \ + -r ta/rpmbuilder \ + -w work \ + {project-to-build} + find work/ + fi - builder: name: ta-builder-scm builders: - - shell: |2- - #!/bin/bash -ex - rm -rf {project} - git clone {git-url}/{project} {project} - pushd {project} - if echo {ref} | grep -q "refs/"; then - git fetch origin {ref} - git checkout FETCH_HEAD - else - git checkout {ref} - fi - popd + - shell: |2- + #!/bin/bash -ex + rm -rf {project} + git clone {git-url}/{project} {project} + pushd {project} + if echo {ref} | grep -q "refs/"; then + git fetch origin {ref} + git checkout FETCH_HEAD + else + git checkout {ref} + fi + popd - builder: name: ta-lf-infra-ship-rpms @@ -187,10 +168,10 @@ - lf-provide-maven-settings-cleanup - config-file-provider: files: - - file-id: 'ta-settings' - variable: 'SETTINGS_FILE' + - file-id: "ta-settings" + variable: "SETTINGS_FILE" - inject: - properties-content: 'ALT_NEXUS_URL=https://nexus3.akraino.org' + properties-content: "ALT_NEXUS_URL=https://nexus3.akraino.org" - lf-infra-create-netrc: server-id: rpm.snapshots - inject: @@ -213,8 +194,8 @@ - lf-provide-maven-settings-cleanup - config-file-provider: files: - - file-id: 'ta-settings' - variable: 'SETTINGS_FILE' + - file-id: "ta-settings" + variable: "SETTINGS_FILE" - lf-infra-create-netrc: server-id: images-snapshots - shell: !include-raw: @@ -229,60 +210,60 @@ - builder: name: ta-builder-job-verify builders: - - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/manifest' - ref: '$SCM_REFSPEC_MANIFEST' - - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/build-tools' - ref: '$SCM_REFSPEC_BUILD_TOOLS' - - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/rpmbuilder' - ref: '$SCM_REFSPEC_RPMBUILDER' - - ta-builder-tox - - ta-builder-rpm: - project-to-build: '$GERRIT_PROJECT' + - ta-builder-scm: + git-url: "{git-url}" + project: "ta/manifest" + ref: "$SCM_REFSPEC_MANIFEST" + - ta-builder-scm: + git-url: "{git-url}" + project: "ta/build-tools" + ref: "$SCM_REFSPEC_BUILD_TOOLS" + - ta-builder-scm: + git-url: "{git-url}" + project: "ta/rpmbuilder" + ref: "$SCM_REFSPEC_RPMBUILDER" + - ta-builder-tox + - ta-builder-rpm: + project-to-build: "$GERRIT_PROJECT" - builder: name: ta-builder-job-verify-ta/rpmbuilder builders: - - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/manifest' - ref: '$SCM_REFSPEC_MANIFEST' - - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/build-tools' - ref: '$SCM_REFSPEC_BUILD_TOOLS' - - ta-builder-scm: - git-url: '{git-url}' - project: '$SCM_PROJECT_TO_BUILD' - ref: '$SCM_PROJECT_TO_BUILD_REFSPEC' - - ta-builder-tox - - ta-builder-rpm: - # Just package some random project to verify "rpmbuilder" changes - project-to-build: '$SCM_PROJECT_TO_BUILD' + - ta-builder-scm: + git-url: "{git-url}" + project: "ta/manifest" + ref: "$SCM_REFSPEC_MANIFEST" + - ta-builder-scm: + git-url: "{git-url}" + project: "ta/build-tools" + ref: "$SCM_REFSPEC_BUILD_TOOLS" + - ta-builder-scm: + git-url: "{git-url}" + project: "$SCM_PROJECT_TO_BUILD" + ref: "$SCM_PROJECT_TO_BUILD_REFSPEC" + - ta-builder-tox + - ta-builder-rpm: + # Just package some random project to verify "rpmbuilder" changes + project-to-build: "$SCM_PROJECT_TO_BUILD" - builder: name: ta-builder-job-merge builders: - - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/manifest' - ref: '$SCM_REFSPEC_MANIFEST' - - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/build-tools' - ref: '$SCM_REFSPEC_BUILD_TOOLS' - - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/rpmbuilder' - ref: '$SCM_REFSPEC_RPMBUILDER' - - ta-builder-rpm: - project-to-build: '$GERRIT_PROJECT' - - ta-lf-infra-ship-rpms + - ta-builder-scm: + git-url: "{git-url}" + project: "ta/manifest" + ref: "$SCM_REFSPEC_MANIFEST" + - ta-builder-scm: + git-url: "{git-url}" + project: "ta/build-tools" + ref: "$SCM_REFSPEC_BUILD_TOOLS" + - ta-builder-scm: + git-url: "{git-url}" + project: "ta/rpmbuilder" + ref: "$SCM_REFSPEC_RPMBUILDER" + - ta-builder-rpm: + project-to-build: "$GERRIT_PROJECT" + - ta-lf-infra-ship-rpms - builder: name: ta-builder-install-docker @@ -334,47 +315,47 @@ name: ta-trigger-job-verify triggers: - gerrit: - server-name: '{gerrit-server-name}' + server-name: "{gerrit-server-name}" trigger-on: - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' + exclude-drafts: "false" + exclude-trivial-rebase: "false" + exclude-no-code-change: "false" - draft-published-event - comment-added-contains-event: - comment-contains-value: 'recheck' + comment-contains-value: "recheck" - comment-added-contains-event: - comment-contains-value: 'reverify' + comment-contains-value: "reverify" projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' + - project-compare-type: "ANT" + project-pattern: "{project}" branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' + - branch-compare-type: "ANT" + branch-pattern: "**/{branch}" readable-message: true skip-vote: - successful: '{gerrit-skip-vote}' - failed: '{gerrit-skip-vote}' - unstable: '{gerrit-skip-vote}' - notbuilt: '{gerrit-skip-vote}' + successful: "{gerrit-skip-vote}" + failed: "{gerrit-skip-vote}" + unstable: "{gerrit-skip-vote}" + notbuilt: "{gerrit-skip-vote}" - trigger: name: ta-trigger-job-merge triggers: - gerrit: - server-name: '{gerrit-server-name}' + server-name: "{gerrit-server-name}" trigger-on: # Not sure if it would be better to use "change-merged" here and just clone the master # branch. With the current approach the SCM can be identical in verify and merge jobs. - ref-updated-event - comment-added-contains-event: - comment-contains-value: 'remerge' + comment-contains-value: "remerge" projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' + - project-compare-type: "ANT" + project-pattern: "{project}" branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' + - branch-compare-type: "ANT" + branch-pattern: "**/{branch}" readable-message: true ############# @@ -391,9 +372,9 @@ publishers: - lf-infra-publish - ta-publisher-ci-build: - arch: '{arch}' + arch: "{arch}" - trigger-parameterized-builds: - - project: 'ta-ci-build-{arch}' + - project: "ta-ci-build-{arch}" condition: UNSTABLE_OR_BETTER trigger-with-no-params: true diff --git a/jjb/akraino-templates/akraino-ta-common-templates.yaml b/jjb/akraino-templates/akraino-ta-common-templates.yaml index 4833947..351e02e 100644 --- a/jjb/akraino-templates/akraino-ta-common-templates.yaml +++ b/jjb/akraino-templates/akraino-ta-common-templates.yaml @@ -1,7 +1,7 @@ --- - job-template: id: akraino-project-stream-type-ta - name: '{project-name}-{stream}-{project-type}' + name: "{project-name}-{stream}-{project-type}" archive-artifacts: > work/**/*.spec work/**/*.repo @@ -17,63 +17,67 @@ stream: master project-type: freestyle submodule-recursive: true - node: '{build-node}' + node: "{build-node}" arch: amd64 gerrit-skip-vote: false + default-refspec: refs/heads/master properties: - lf-infra-properties: - project: '{project}' - build-days-to-keep: '{build-days-to-keep}' + project: "{project}" + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - lftools-version: '{lftools-version}' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + lftools-version: "{lftools-version}" - - ta-parameters-ci + - ta-parameters: + scm-refspec-manifest: "{default-refspec}" + scm-refspec-build-tools: "{default-refspec}" + scm-refspec-rpmbuilder: "{default-refspec}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" scm: - ta-lf-infra-gerrit-scm-{project-type}: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' - basedir: '$GERRIT_PROJECT' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" + basedir: "$GERRIT_PROJECT" triggers: - ta-trigger-job-{project-type}: - gerrit-server-name: '{gerrit-server-name}' - gerrit-skip-vote: '{gerrit-skip-vote}' - project: '{project}' - branch: '{branch}' + gerrit-server-name: "{gerrit-server-name}" + gerrit-skip-vote: "{gerrit-skip-vote}" + project: "{project}" + branch: "{branch}" builders: - ta-builder-install-docker - ta-builder-job-{project-type}: - git-url: '{git-url}' + git-url: "{git-url}" publishers: - ta-publisher-job-{project-type}: - arch: '{arch}' + arch: "{arch}" - job-template: id: akraino-project-stream-type-ta-rpmbuilder - name: '{project-name}-{stream}-{project-type}' + name: "{project-name}-{stream}-{project-type}" archive-artifacts: > work/**/*.spec work/**/*.repo @@ -89,61 +93,67 @@ stream: master project-type: freestyle submodule-recursive: true - node: '{build-node}' + node: "{build-node}" gerrit-skip-vote: false + default-refspec: refs/heads/master + project-to-build: "ta/yarf" properties: - lf-infra-properties: - project: '{project}' - build-days-to-keep: '{build-days-to-keep}' + project: "{project}" + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - lftools-version: '{lftools-version}' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + lftools-version: "{lftools-version}" - - ta-parameters-ci-{project} + - ta-parameters: + scm-refspec-manifest: "{default-refspec}" + scm-refspec-build-tools: "{default-refspec}" + scm-project-to-build-refspec: "{default-refspec}" + scm-project-to-build: "{project-to-build}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" scm: - ta-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' - choosing-strategy: 'gerrit' - basedir: '$GERRIT_PROJECT' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" + choosing-strategy: "gerrit" + basedir: "$GERRIT_PROJECT" triggers: - ta-trigger-job-{project-type}: - gerrit-server-name: '{gerrit-server-name}' - gerrit-skip-vote: '{gerrit-skip-vote}' - project: '{project}' - branch: '{branch}' + gerrit-server-name: "{gerrit-server-name}" + gerrit-skip-vote: "{gerrit-skip-vote}" + project: "{project}" + branch: "{branch}" builders: - ta-builder-job-{project-type}-{project}: - git-url: '{git-url}' + git-url: "{git-url}" publishers: - lf-infra-publish - job-template: id: akraino-project-stream-type-ta-build - name: '{project-name}-{stream}-{project-type}' + name: "{project-name}-{stream}-{project-type}" archive-artifacts: > work/**/*.spec work/**/*.repo @@ -159,48 +169,48 @@ stream: master project-type: freestyle submodule-recursive: true - node: '{build-node}' + node: "{build-node}" gerrit-skip-vote: false properties: - lf-infra-properties: - project: '{project}' - build-days-to-keep: '{build-days-to-keep}' + project: "{project}" + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - lftools-version: '{lftools-version}' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + lftools-version: "{lftools-version}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" scm: - ta-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' - choosing-strategy: 'gerrit' - basedir: '$GERRIT_PROJECT' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" + choosing-strategy: "gerrit" + basedir: "$GERRIT_PROJECT" triggers: - ta-trigger-job-{project-type}: - gerrit-server-name: '{gerrit-server-name}' - gerrit-skip-vote: '{gerrit-skip-vote}' - project: '{project}' - branch: '{branch}' + gerrit-server-name: "{gerrit-server-name}" + gerrit-skip-vote: "{gerrit-skip-vote}" + project: "{project}" + branch: "{branch}" builders: - ta-builder-tox @@ -211,7 +221,7 @@ - job-template: id: akraino-project-release-ta-build - name: '{name}' + name: "{name}" archive-artifacts: > work/**/*.spec work/**/*.repo @@ -231,60 +241,62 @@ stream: master project-type: freestyle submodule-recursive: true - node: '{build-node}' + node: "{build-node}" + default-refspec: refs/heads/master properties: - lf-infra-properties: - project: '{project}' - build-days-to-keep: '{build-days-to-keep}' + project: "{project}" + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - lftools-version: '{lftools-version}' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + lftools-version: "{lftools-version}" - - ta-parameters-manifest - - ta-parameters-build-tools + - ta-parameters: + scm-refspec-manifest: "{default-refspec}" + scm-refspec-build-tools: "{default-refspec}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" triggers: - gerrit: - server-name: '{gerrit-server-name}' + server-name: "{gerrit-server-name}" trigger-on: - ref-updated-event projects: - - project-compare-type: 'ANT' - project-pattern: 'ta/manifest' + - project-compare-type: "ANT" + project-pattern: "ta/manifest" branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - - project-compare-type: 'ANT' - project-pattern: 'ta/build-tools' + - branch-compare-type: "ANT" + branch-pattern: "**/{branch}" + - project-compare-type: "ANT" + project-pattern: "ta/build-tools" branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' + - branch-compare-type: "ANT" + branch-pattern: "**/{branch}" builders: - lf-display-node-uuid - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/manifest' - ref: '$SCM_REFSPEC_MANIFEST' + git-url: "{git-url}" + project: "ta/manifest" + ref: "$SCM_REFSPEC_MANIFEST" - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/build-tools' - ref: '$SCM_REFSPEC_BUILD_TOOLS' + git-url: "{git-url}" + project: "ta/build-tools" + ref: "$SCM_REFSPEC_BUILD_TOOLS" - ta-builder-install-docker - ta-builder-install-build-tools - shell: |2- @@ -294,4 +306,4 @@ publishers: - ta-publisher-ci-build: - arch: '{name}' + arch: "{name}" diff --git a/jjb/akraino-templates/akraino-usecase-macros.yaml b/jjb/akraino-templates/akraino-usecase-macros.yaml index f697f9c..3b86010 100644 --- a/jjb/akraino-templates/akraino-usecase-macros.yaml +++ b/jjb/akraino-templates/akraino-usecase-macros.yaml @@ -3,28 +3,28 @@ # PARAMETERS # ############## - parameter: - name: 'seba_on_arm-defaults' + name: "seba_on_arm-defaults" parameters: - string: name: PON_TYPE - default: 'ponsim' + default: "ponsim" ######################## # publisher macros ######################## - publisher: - name: 'seba_on_arm-install-publisher' + name: "seba_on_arm-install-publisher" publishers: - email: recipients: armband@enea.com - lf-infra-publish - publisher: - name: 'seba_on_arm-test-publisher' + name: "seba_on_arm-test-publisher" publishers: - seba_on_arm-install-publisher - robot: - output-path: 'results' - report-html: '**/report.html' - log-html: '**/log.html' - output-xml: '**/output.xml' + output-path: "results" + report-html: "**/report.html" + log-html: "**/log.html" + output-xml: "**/output.xml" diff --git a/jjb/akraino-templates/akraino-usecase-templates.yaml b/jjb/akraino-templates/akraino-usecase-templates.yaml index 2e245ea..91611a4 100644 --- a/jjb/akraino-templates/akraino-usecase-templates.yaml +++ b/jjb/akraino-templates/akraino-usecase-templates.yaml @@ -1,60 +1,59 @@ --- - job-template: &akraino-usecase-phase-rec id: akraino-usecase-phase-rec - name: 'rec-{slave_label}-{phase}-{usecase}-{job_frequency}-{stream}' + name: "rec-{slave_label}-{phase}-{usecase}-{job_frequency}-{stream}" concurrent: true - node: '{slave_label}' + node: "{slave_label}" # Support usecases that reside in a different project repo, e.g. # seba_on_arm usecase uses the 'iec' project git repo, even if this # job targets a different project, 'rec'. - usecase_project: 'iec' + usecase_project: "iec" properties: - throttle: enabled: true max-total: 4 max-per-node: 1 - option: 'project' + option: "project" - build-blocker: use-build-blocker: true blocking-jobs: - - '.*-{usecase}-.*' - block-level: 'NODE' + - ".*-{usecase}-.*" + block-level: "NODE" parameters: - lf-infra-parameters: - project: '{usecase_project}' - stream: '{stream}' - branch: '{branch}' - - '{project}-defaults' - - '{usecase}-defaults' + project: "{usecase_project}" + stream: "{stream}" + branch: "{branch}" + - "{project}-defaults" + - "{usecase}-defaults" scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{usecase_project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{usecase_project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" submodule-recursive: false - submodule-timeout: '{submodule-timeout}' + submodule-timeout: "{submodule-timeout}" submodule-disable: true choosing-strategy: default builders: - - shell: - !include-raw-escape: ../shell/{usecase}.sh + - shell: !include-raw-escape: ../shell/{usecase}.sh publishers: - - '{usecase}-{phase}-publisher' + - "{usecase}-{phase}-publisher" - job-template: <<: *akraino-usecase-phase-rec id: akraino-usecase-phase-iec - name: 'iec-{iecType}-{phase}-{usecase}-{installer}-{deploy_type}-{os}-daily-{stream}' + name: "iec-{iecType}-{phase}-{usecase}-{installer}-{deploy_type}-{os}-daily-{stream}" parameters: - lf-infra-parameters: - project: '{usecase_project}' - stream: '{stream}' - branch: '{branch}' - - '{project}-defaults' - - '{installer}-{os}-defaults' - - '{usecase}-defaults' + project: "{usecase_project}" + stream: "{stream}" + branch: "{branch}" + - "{project}-defaults" + - "{installer}-{os}-defaults" + - "{usecase}-defaults" diff --git a/jjb/akraino-templates/akraino-validation-macros.yaml b/jjb/akraino-templates/akraino-validation-macros.yaml index 68ad5c5..ed2d9b1 100644 --- a/jjb/akraino-templates/akraino-validation-macros.yaml +++ b/jjb/akraino-templates/akraino-validation-macros.yaml @@ -8,61 +8,49 @@ - lab_params - string: name: LAB_SILO - default: '' - description: 'Folder in nexus where the logs are pushed.' + default: "" + description: "Folder in nexus where the logs are pushed." - string: name: SETTINGS_FILE - default: '/home/jenkins/settings.xml' - description: 'Path to credentials file' + default: "/home/jenkins/settings.xml" + description: "Path to credentials file" - parameter: name: lab_params parameters: - string: name: CLUSTER_MASTER_IP - default: '' - description: 'IP address to connect to the cluster master' + default: "" + description: "IP address to connect to the cluster master" - string: name: CLUSTER_SSH_USER - default: '' - description: 'SSH username to connect to the cluster master ' + default: "" + description: "SSH username to connect to the cluster master " - string: name: CLUSTER_SSH_PASSWORD - default: '' - description: 'SSH password to connect to the cluster master' + default: "" + description: "SSH password to connect to the cluster master" - string: name: CLUSTER_SSH_KEY - default: '' - description: 'SSH key to connect to the cluster master' + default: "" + description: "SSH key to connect to the cluster master" - string: name: BLUEPRINT - default: '' - description: 'Blueprint used' + default: "" + description: "Blueprint used" - string: name: LAYER - default: '' - description: 'Layer' + default: "" + description: "Layer" - string: name: VERSION - default: '' - description: 'Version' + default: "" + description: "Version" - string: name: OPTIONAL - default: '' - description: 'If set to yes run optional tests' + default: "" + description: "If set to yes run optional tests" - string: name: PULL - default: 'false' - description: 'If set to yes pull docker images before run' - -############ -# SETTINGS # -############ -# settings for jobs run in multijob phases -- _docker-build-job-settings: &docker-build-job-settings - name: docker_build_job_settings - current-parameters: true - git-revision: false - node-parameters: false - kill-phase-on: FAILURE - abort-all-jobs: false + default: "false" + description: "If set to yes pull docker images before run" diff --git a/jjb/akraino-templates/akraino-validation-templates.yaml b/jjb/akraino-templates/akraino-validation-templates.yaml index cb74915..5efd2ac 100644 --- a/jjb/akraino-templates/akraino-validation-templates.yaml +++ b/jjb/akraino-templates/akraino-validation-templates.yaml @@ -1,45 +1,60 @@ --- +############ +# SETTINGS # +############ +# settings for jobs run in multijob phases +- _docker-build-job-settings: &docker-build-job-settings + name: docker_build_job_settings + current-parameters: true + git-revision: false + node-parameters: false + kill-phase-on: FAILURE + abort-all-jobs: false + +############# +# TEMPLATES # +############# - job-template: id: akraino-validation-docker-multiarch - name: 'validation-{stream}-docker' + name: "validation-{stream}-docker" project-type: multijob - disabled: '{obj:disabled}' - node: 'centos7-builder-2c-1g' + disabled: "{obj:disabled}" + node: "centos7-builder-2c-1g" build-timeout: 90 parameters: - lf-infra-parameters: &validation_lf_infra_parameters - project: '{project}' - branch: '{branch}' - stream: '{stream}' + project: "{project}" + branch: "{branch}" + stream: "{stream}" properties: - throttle: max-per-node: 1 - option: 'project' + option: "project" - build-blocker: use-build-blocker: true blocking-jobs: - - 'validation-docker-.*' - block-level: 'NODE' + - "validation-docker-.*" + block-level: "NODE" - triggers: '{obj:triggers}' + triggers: "{obj:triggers}" builders: - multijob: - name: 'build validation images' + name: "build validation images" execution-type: PARALLEL projects: - - name: 'validation-docker-build-amd64-{stream}' + - name: "validation-docker-build-amd64-{stream}" <<: *docker-build-job-settings - - name: 'validation-docker-build-arm64-{stream}' + - name: "validation-docker-build-arm64-{stream}" <<: *docker-build-job-settings - multijob: - name: 'publish validation manifests' + name: "publish validation manifests" condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'validation-docker-manifest-{stream}' + - name: "validation-docker-manifest-{stream}" <<: *docker-build-job-settings publishers: @@ -49,12 +64,11 @@ cristina.pauna@enea.com juha.kosonen@nokia.com - - job-template: id: akraino-validation-docker-specific-arch - name: 'validation-docker-build-{arch_tag}-{stream}' - disabled: '{obj:disabled}' - node: '{slave_label}' + name: "validation-docker-build-{arch_tag}-{stream}" + disabled: "{obj:disabled}" + node: "{slave_label}" build-timeout: 75 parameters: @@ -64,25 +78,25 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'validation-docker-build-.*' - block-level: 'NODE' + - "validation-docker-build-.*" + block-level: "NODE" scm: &validation_scm # lf-infra-gerrit-scm hardcodes branch specifier to refs/heads; while # lf-infra-github-scm does not, allowing us to pass a fully custom '{branch}' - lf-infra-github-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$STREAM' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$STREAM" submodule-recursive: false - submodule-timeout: '{submodule-timeout}' + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: default builders: - lf-infra-docker-login: global-settings-file: global-settings - settings-file: '{mvn-settings}' + settings-file: "{mvn-settings}" - shell: | #!/bin/bash -ex if [ "{branch}" != "{stream}" ]; then export TAG_VER=$STREAM; fi @@ -94,21 +108,21 @@ - job-template: id: akraino-validation-docker-manifest - name: 'validation-docker-manifest-{stream}' - node: 'ubuntu1804-docker-8c-8g' + name: "validation-docker-manifest-{stream}" + node: "ubuntu1804-docker-8c-8g" build-timeout: 15 parameters: - lf-infra-parameters: *validation_lf_infra_parameters - disabled: '{obj:disabled}' + disabled: "{obj:disabled}" scm: *validation_scm builders: - lf-infra-docker-login: global-settings-file: global-settings - settings-file: '{mvn-settings}' + settings-file: "{mvn-settings}" - shell: | #!/bin/bash -ex if [ "{branch}" != "{stream}" ]; then export TAG_VER=$STREAM; fi @@ -119,16 +133,15 @@ - job-template: id: akraino-validation-lab-daily - name: 'validation-{validation_lab}-daily-{stream}' + name: "validation-{validation_lab}-daily-{stream}" concurrent: true - node: '{build-node}' + node: "{build-node}" parameters: - - {'lab_params'} + - lab_params builders: - trigger-builds: - - project: 'bluval-daily-{stream}' - predefined-parameters: - LAB_SILO={validation_lab} + - project: "bluval-daily-{stream}" + predefined-parameters: LAB_SILO={validation_lab} same-node: true current-parameters: true block: true @@ -138,24 +151,26 @@ - job-template: id: bluval-run-daily-tests - name: 'bluval-daily-{stream}' + name: "bluval-daily-{stream}" concurrent: true - node: '{build-node}' + node: "{build-node}" + lab-silo: "" parameters: - lf-infra-parameters: *validation_lf_infra_parameters - string: name: DEPLOY_SCENARIO - default: '' - - {'bluval-defaults'} + default: "" + - bluval-defaults: + lab-silo: "{lab-silo}" scm: - lf-infra-github-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" submodule-recursive: false - submodule-timeout: '{submodule-timeout}' + submodule-timeout: "{submodule-timeout}" submodule-disable: true choosing-strategy: default @@ -165,15 +180,15 @@ - lf-infra-create-netrc: server-id: logs - shell: !include-raw-escape: - - ../shell/run_bluval.sh + - ../shell/run_bluval.sh publishers: - lf-infra-publish - robot: - output-path: 'results' - report-html: '**/report.html' - log-html: '**/log.html' - output-xml: '**/output.xml' + output-path: "results" + report-html: "**/report.html" + log-html: "**/log.html" + output-xml: "**/output.xml" - logparser: use-project-rules: true parse-rules: "./bluval/rules.txt" diff --git a/jjb/camunda_workflow/camunda_workflow-docker.yaml b/jjb/camunda_workflow/camunda_workflow-docker.yaml index 31e4eb5..4e9dea6 100644 --- a/jjb/camunda_workflow/camunda_workflow-docker.yaml +++ b/jjb/camunda_workflow/camunda_workflow-docker.yaml @@ -23,12 +23,12 @@ stream: master java-version: openjdk8 mvn-version: mvn35 - mvn-opts: '' - mvn-params: '-f akraino' + mvn-opts: "" + mvn-params: "-f akraino" mvn-settings: camunda_workflow-settings build-timeout: 60 submodule-recursive: true branch: master jobs: - - 'akraino-project-stream-docker' - - 'akraino-project-stream-stage-docker' + - "akraino-project-stream-docker" + - "akraino-project-stream-stage-docker" diff --git a/jjb/camunda_workflow/camunda_workflow.yaml b/jjb/camunda_workflow/camunda_workflow.yaml index 0be9fa7..7a30a53 100644 --- a/jjb/camunda_workflow/camunda_workflow.yaml +++ b/jjb/camunda_workflow/camunda_workflow.yaml @@ -19,16 +19,16 @@ project: camunda_workflow project-name: camunda_workflow mvn-settings: camunda_workflow-settings - mvn-params: '-f akraino' - nexus-iq-namespace: 'akraino-' + mvn-params: "-f akraino" + nexus-iq-namespace: "akraino-" sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-api-token: "{sonarcloud_api_token}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" build-node: centos7-builder-2c-1g stream: master jobs: - - '{project-name}-maven-jobs' + - "{project-name}-maven-jobs" - gerrit-maven-sonar views: - project-view diff --git a/jjb/ci-management/ci-jobs.yaml b/jjb/ci-management/ci-jobs.yaml index e1ba32a..254e064 100644 --- a/jjb/ci-management/ci-jobs.yaml +++ b/jjb/ci-management/ci-jobs.yaml @@ -12,7 +12,7 @@ project: ci-management project-name: ci-management build-node: centos7-builder-2c-1g - jjb-version: 4.1.0 + jjb-version: 5.0.2 views: - project-view diff --git a/jjb/ci-management/static-slaves-ci-jobs.yaml b/jjb/ci-management/static-slaves-ci-jobs.yaml deleted file mode 100644 index 528d260..0000000 --- a/jjb/ci-management/static-slaves-ci-jobs.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- project: - name: static-slaves-ci-jobs - - project: ci-management - project-name: ci-management - branch: master - stream: '{branch}' - - build-node: - - aarch64_dev - - aarch64_build - - aarch64_baremetal - - aarch64_baremetal_dev - - jobs: - - akraino-project-build-node-init: - disable_job: false diff --git a/jjb/common-views.yaml b/jjb/common-views.yaml index c3b0e4b..c8f11bd 100644 --- a/jjb/common-views.yaml +++ b/jjb/common-views.yaml @@ -1,6 +1,6 @@ --- - view: - name: '00-Empty View' + name: "00-Empty View" description: > Empty job view. This is used as the default landing view to keep the Jenkins UI responding better while a) under high load and b) when there @@ -9,11 +9,11 @@ filter-executors: false filter-queue: false recurse: false - regex: '' + regex: "" - view: name: CLM - description: 'List of CLM jobs' + description: "List of CLM jobs" view-type: list filter-executors: false filter-queue: false @@ -27,4 +27,4 @@ - build-button - policy-violations recurse: false - regex: '.*-clm-.*' + regex: ".*-clm-.*" diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index c2d392a..a2bc8ee 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -3,9 +3,9 @@ name: global gerrit-server-name: Primary - git-url: 'ssh://akraino-jobbuilder@gerrit.akraino.org:29418' + git-url: "ssh://akraino-jobbuilder@gerrit.akraino.org:29418" jenkins-ssh-credential: jenkins-ssh - lftools-version: '<1.0.0' + lftools-version: "<1.0.0" submodule-timeout: 10 # Nexus 2 for jars diff --git a/jjb/icn/icn-daaas.yaml b/jjb/icn/icn-daaas.yaml index 6bbcbd3..48ae6c8 100644 --- a/jjb/icn/icn-daaas.yaml +++ b/jjb/icn/icn-daaas.yaml @@ -17,7 +17,7 @@ # - project: name: icn-daaas - project: 'icn/daaas' + project: "icn/daaas" project-name: icn-daaas build-node: ubuntu1804-helm-8c-32g stream: diff --git a/jjb/iec/iec-verify-jobs.yaml b/jjb/iec/iec-verify-jobs.yaml index fbc8e1b..46f36e1 100644 --- a/jjb/iec/iec-verify-jobs.yaml +++ b/jjb/iec/iec-verify-jobs.yaml @@ -3,17 +3,17 @@ project: iec project-name: iec name: iec-tox-verify - tox-envs: 'coala' + tox-envs: "coala" stream: - master: - branch: '{stream}' - gs-pathname: '' + branch: "{stream}" + gs-pathname: "" disabled: false jobs: - - 'gerrit-tox-verify': + - "gerrit-tox-verify": parallel: false submodule-disable: true parameters: - lf-infra-tox-parameters: - tox-envs: '{tox-envs}' + tox-envs: "{tox-envs}" build-node: centos7-builder-2c-1g diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml index 261dfd2..7d8118d 100644 --- a/jjb/iec/iec.yaml +++ b/jjb/iec/iec.yaml @@ -1,19 +1,19 @@ --- - project: - name: 'iec' - project-name: 'iec' - project: '{project-name}' + name: "iec" + project-name: "iec" + project: "{project-name}" views: - common-view: view-name: iec - view-regex: '^{project-name}-(sonar|(tox|type1|type2)-(verify|fuel|compass)-.*)' + view-regex: "^{project-name}-(sonar|(tox|type1|type2)-(verify|fuel|compass)-.*)" # ------------------------------- # BRANCH DEFINITIONS # ------------------------------- stream: - master: - branch: 'master' - gs-pathname: '' + branch: "master" + gs-pathname: "" disabled: false # ------------------------------- @@ -29,7 +29,7 @@ os: - ubuntu1804 - centos7 - #-------------------------------- + # ------------------------------- # IEC TYPE DEFINITINONS # type1 Mcbin embeded board # type2 Arm Server @@ -42,11 +42,11 @@ # ------------------------------- deploy_type: - baremetal: - slave_label: 'aarch64_baremetal_dev' - scenario: 'k8-calico-iec-noha' + slave_label: "aarch64_baremetal_dev" + scenario: "k8-calico-iec-noha" - virtual: - slave_label: 'aarch64_dev' - scenario: 'k8-calico-iec-noha' + slave_label: "aarch64_dev" + scenario: "k8-calico-iec-noha" exclude: # Compass does not run against baremetal PODs yet diff --git a/jjb/kni/kni_installer.yaml b/jjb/kni/kni_installer.yaml index 8ed4c7f..47169bc 100644 --- a/jjb/kni/kni_installer.yaml +++ b/jjb/kni/kni_installer.yaml @@ -1,7 +1,7 @@ --- - project: name: kni-installer - project: 'kni/installer' + project: "kni/installer" project-name: kni-installer stream: master branch: master @@ -10,7 +10,7 @@ - project: name: kni-blueprint-pae - project: 'kni/blueprint-pae' + project: "kni/blueprint-pae" project-name: blueprint-pae stream: master branch: master @@ -21,7 +21,7 @@ - project: name: kni-blueprint-basic-3-masters - project: 'kni/blueprint-basic-3-masters' + project: "kni/blueprint-basic-3-masters" project-name: blueprint-basic-3-masters stream: master branch: master @@ -32,7 +32,7 @@ - project: name: kni-blueprint-management-hub - project: 'kni/blueprint-management-hub' + project: "kni/blueprint-management-hub" project-name: blueprint-management-hub stream: master branch: master @@ -41,7 +41,7 @@ - project: name: kni-blueprint-ie - project: 'kni/blueprint-ie' + project: "kni/blueprint-ie" project-name: blueprint-ie stream: master branch: master diff --git a/jjb/nc/nc-ovs-dpdk-unicycle.yaml b/jjb/nc/nc-ovs-dpdk-unicycle.yaml index 10bbd2b..75f7bd5 100644 --- a/jjb/nc/nc-ovs-dpdk-unicycle.yaml +++ b/jjb/nc/nc-ovs-dpdk-unicycle.yaml @@ -14,4 +14,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/portal_user_interface/portal-onapsdk-docker.yaml b/jjb/portal_user_interface/portal-onapsdk-docker.yaml index 5e57fa3..459be14 100644 --- a/jjb/portal_user_interface/portal-onapsdk-docker.yaml +++ b/jjb/portal_user_interface/portal-onapsdk-docker.yaml @@ -16,19 +16,19 @@ # - project: project-name: portal_user_interface-portal-onapsdk - project: 'portal_user_interface/portal-onapsdk' + project: "portal_user_interface/portal-onapsdk" name: portal_user_interface-portal-onapsdk-docker global-settings-file: global-settings build-node: ubuntu1804-docker-8c-8g stream: master java-version: openjdk8 mvn-version: mvn35 - mvn-opts: '' - mvn-params: '' + mvn-opts: "" + mvn-params: "" mvn-settings: portal_user_interface-settings build-timeout: 60 submodule-recursive: true branch: master jobs: - - 'akraino-project-stream-docker' - - 'akraino-project-stream-stage-docker' + - "akraino-project-stream-docker" + - "akraino-project-stream-stage-docker" diff --git a/jjb/portal_user_interface/portal-onapsdk.yaml b/jjb/portal_user_interface/portal-onapsdk.yaml index 6be5b6d..1f66fcb 100644 --- a/jjb/portal_user_interface/portal-onapsdk.yaml +++ b/jjb/portal_user_interface/portal-onapsdk.yaml @@ -15,28 +15,28 @@ # limitations under the License. # - project: - project: 'portal_user_interface/portal-onapsdk' + project: "portal_user_interface/portal-onapsdk" project-name: portal_user_interface-portal-onapsdk name: portal_user_interface-portal-onapsdk build-node: centos7-builder-2c-1g mvn-settings: portal_user_interface-settings - mvn-params: '' - nexus-iq-namespace: 'akraino-' + mvn-params: "" + nexus-iq-namespace: "akraino-" sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_portal_user_interface' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-api-token: "{sonarcloud_api_token}" + sonarcloud-project-key: "{sonarcloud_project_organization}_portal_user_interface" stream: master jobs: - - 'gerrit-tox-verify': + - "gerrit-tox-verify": parallel: false submodule-disable: true stream: - master: - branch: '{stream}' - gs-pathname: '' + branch: "{stream}" + gs-pathname: "" disabled: false - - '{project-name}-maven-jobs' + - "{project-name}-maven-jobs" - gerrit-maven-sonar views: - project-view diff --git a/jjb/portal_user_interface/portal_user_interface-docker.yaml b/jjb/portal_user_interface/portal_user_interface-docker.yaml index 2f45d70..10c959f 100644 --- a/jjb/portal_user_interface/portal_user_interface-docker.yaml +++ b/jjb/portal_user_interface/portal_user_interface-docker.yaml @@ -23,12 +23,12 @@ stream: master java-version: openjdk8 mvn-version: mvn35 - mvn-opts: '' - mvn-params: '-f AECPortalMgmt' + mvn-opts: "" + mvn-params: "-f AECPortalMgmt" mvn-settings: portal_user_interface-settings build-timeout: 60 submodule-recursive: true branch: master jobs: - - 'akraino-project-stream-docker' - - 'akraino-project-stream-stage-docker' + - "akraino-project-stream-docker" + - "akraino-project-stream-stage-docker" diff --git a/jjb/portal_user_interface/portal_user_interface.yaml b/jjb/portal_user_interface/portal_user_interface.yaml index 76aa2b4..05f5120 100644 --- a/jjb/portal_user_interface/portal_user_interface.yaml +++ b/jjb/portal_user_interface/portal_user_interface.yaml @@ -19,16 +19,16 @@ project: portal_user_interface project-name: portal_user_interface mvn-settings: portal_user_interface-settings - mvn-params: '-f AECPortalMgmt' - nexus-iq-namespace: 'akraino-' + mvn-params: "-f AECPortalMgmt" + nexus-iq-namespace: "akraino-" sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-api-token: "{sonarcloud_api_token}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" build-node: centos7-builder-2c-1g stream: master jobs: - - '{project-name}-maven-jobs' + - "{project-name}-maven-jobs" - gerrit-maven-sonar views: - project-view diff --git a/jjb/postgres_db_schema/postgres_db_schema.yaml b/jjb/postgres_db_schema/postgres_db_schema.yaml index f32ee71..dfac4f8 100644 --- a/jjb/postgres_db_schema/postgres_db_schema.yaml +++ b/jjb/postgres_db_schema/postgres_db_schema.yaml @@ -23,14 +23,14 @@ stream: master java-version: openjdk8 mvn-version: mvn35 - mvn-opts: '' - mvn-params: '' + mvn-opts: "" + mvn-params: "" mvn-settings: postgres_db_schema-settings build-timeout: 60 submodule-recursive: true branch: master jobs: - - 'akraino-project-stream-docker' - - 'akraino-project-stream-stage-docker' + - "akraino-project-stream-docker" + - "akraino-project-stream-stage-docker" views: - project-view diff --git a/jjb/rec/rec.yaml b/jjb/rec/rec.yaml index 8a80b3b..0d8ef96 100644 --- a/jjb/rec/rec.yaml +++ b/jjb/rec/rec.yaml @@ -1,8 +1,8 @@ --- - project: - name: 'rec' - project-name: 'rec' - project: '{project-name}' + name: "rec" + project-name: "rec" + project: "{project-name}" views: - project-view # ------------------------------- diff --git a/jjb/redfish/redfish-docker.yaml b/jjb/redfish/redfish-docker.yaml index 66e2bc8..2977bcf 100644 --- a/jjb/redfish/redfish-docker.yaml +++ b/jjb/redfish/redfish-docker.yaml @@ -23,12 +23,12 @@ stream: master java-version: openjdk8 mvn-version: mvn35 - mvn-opts: '' - mvn-params: '' + mvn-opts: "" + mvn-params: "" mvn-settings: redfish-settings build-timeout: 60 submodule-recursive: true branch: master jobs: - - 'akraino-project-stream-docker' - - 'akraino-project-stream-stage-docker' + - "akraino-project-stream-docker" + - "akraino-project-stream-stage-docker" diff --git a/jjb/redfish/redfish.yaml b/jjb/redfish/redfish.yaml index de3517b..9e8e901 100644 --- a/jjb/redfish/redfish.yaml +++ b/jjb/redfish/redfish.yaml @@ -29,4 +29,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/regional_controller/api-server-docker.yaml b/jjb/regional_controller/api-server-docker.yaml index c171775..9e70f7a 100644 --- a/jjb/regional_controller/api-server-docker.yaml +++ b/jjb/regional_controller/api-server-docker.yaml @@ -16,19 +16,19 @@ # - project: name: regional_controller-api-server-docker - project: 'regional_controller/api-server' + project: "regional_controller/api-server" project-name: regional_controller-api-server global-settings-file: global-settings build-node: ubuntu1804-docker-8c-8g stream: master java-version: openjdk8 mvn-version: mvn35 - mvn-opts: '' - mvn-params: '' + mvn-opts: "" + mvn-params: "" mvn-settings: regional_controller-settings build-timeout: 60 submodule-recursive: true branch: master jobs: - - 'akraino-project-stream-docker' - - 'akraino-project-stream-stage-docker' + - "akraino-project-stream-docker" + - "akraino-project-stream-stage-docker" diff --git a/jjb/regional_controller/api-server.yaml b/jjb/regional_controller/api-server.yaml index 0b94da7..0455b2d 100644 --- a/jjb/regional_controller/api-server.yaml +++ b/jjb/regional_controller/api-server.yaml @@ -16,19 +16,19 @@ # - project: name: regional_controller-api-server - project: 'regional_controller/api-server' + project: "regional_controller/api-server" project-name: regional_controller-api-server mvn-settings: regional_controller-settings - mvn-params: '' - nexus-iq-namespace: 'akraino-' + mvn-params: "" + nexus-iq-namespace: "akraino-" sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_regional_controller' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-api-token: "{sonarcloud_api_token}" + sonarcloud-project-key: "{sonarcloud_project_organization}_regional_controller" build-node: centos7-builder-2c-1g stream: master jobs: - - '{project-name}-maven-jobs' + - "{project-name}-maven-jobs" - gerrit-maven-sonar views: - project-view diff --git a/jjb/regional_controller/regional_controller.yaml b/jjb/regional_controller/regional_controller.yaml index 7b0de5a..d7ab2dd 100644 --- a/jjb/regional_controller/regional_controller.yaml +++ b/jjb/regional_controller/regional_controller.yaml @@ -29,4 +29,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/sample_vnf/sample_vnf.yaml b/jjb/sample_vnf/sample_vnf.yaml index af3af50..40098de 100644 --- a/jjb/sample_vnf/sample_vnf.yaml +++ b/jjb/sample_vnf/sample_vnf.yaml @@ -29,4 +29,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/starlingx/starlingx.yaml b/jjb/starlingx/starlingx.yaml index 5ff534c..5b55da7 100644 --- a/jjb/starlingx/starlingx.yaml +++ b/jjb/starlingx/starlingx.yaml @@ -11,4 +11,4 @@ - akraino-project-stream-verify views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/test_automation/test_automation.yaml b/jjb/test_automation/test_automation.yaml index a84e8b2..1371d0a 100644 --- a/jjb/test_automation/test_automation.yaml +++ b/jjb/test_automation/test_automation.yaml @@ -29,4 +29,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/validation/bluval.yaml b/jjb/validation/bluval.yaml index e01b3bc..5b16a47 100644 --- a/jjb/validation/bluval.yaml +++ b/jjb/validation/bluval.yaml @@ -30,8 +30,8 @@ - rec stream: - master: - branch: '{stream}' - gs-pathname: '' + branch: "{stream}" + gs-pathname: "" disabled: false jobs: - bluval-run-daily-tests diff --git a/jjb/validation/lab.yaml b/jjb/validation/lab.yaml index c8e3d98..bf3abd2 100644 --- a/jjb/validation/lab.yaml +++ b/jjb/validation/lab.yaml @@ -22,8 +22,8 @@ build-node: centos7-builder-2c-1g stream: - master: - branch: '{stream}' - gs-pathname: '' + branch: "{stream}" + gs-pathname: "" disabled: false validation_lab: - enea diff --git a/jjb/validation/validation-docker.yaml b/jjb/validation/validation-docker.yaml index 7a99536..88fa8f8 100644 --- a/jjb/validation/validation-docker.yaml +++ b/jjb/validation/validation-docker.yaml @@ -1,41 +1,40 @@ --- - project: - name: validation-docker project: validation mvn-settings: validation-settings stream: - master: - branch: '{stream}' + branch: "{stream}" disabled: false triggers: # Build nigtly at 12:10 AM - - timed: '10 0 * * *' + - timed: "10 0 * * *" - 3.0.0: - branch: 'master' + branch: "master" disabled: false triggers: - gerrit: - server-name: '{gerrit-server-name}' + 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' + project-pattern: "ci-management" branches: - branch-compare-type: ANT - branch-pattern: '**/master' + branch-pattern: "**/master" file-paths: - compare-type: REG_EXP - pattern: 'jjb/validation/validation-docker.yaml' + pattern: "jjb/validation/validation-docker.yaml" arch_tag: - - 'amd64': - slave_label: 'ubuntu1804-docker-8c-8g' - - 'arm64': - slave_label: 'aarch64_build' + - "amd64": + slave_label: "ubuntu1804-docker-8c-8g" + - "arm64": + slave_label: "aarch64_build" jobs: - akraino-validation-docker-multiarch diff --git a/jjb/validation/validation-verify-jobs.yaml b/jjb/validation/validation-verify-jobs.yaml index 2d72cc8..d4a0010 100644 --- a/jjb/validation/validation-verify-jobs.yaml +++ b/jjb/validation/validation-verify-jobs.yaml @@ -5,11 +5,11 @@ name: validation-tox-verify stream: - master: - branch: '{stream}' - gs-pathname: '' + branch: "{stream}" + gs-pathname: "" disabled: false jobs: - - 'gerrit-tox-verify': + - "gerrit-tox-verify": parallel: false submodule-disable: true build-node: centos7-builder-2c-1g diff --git a/jjb/validation/validation.yaml b/jjb/validation/validation.yaml index 5ebf9b0..3d17a69 100644 --- a/jjb/validation/validation.yaml +++ b/jjb/validation/validation.yaml @@ -30,4 +30,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/yaml_builds/yaml_builds.yaml b/jjb/yaml_builds/yaml_builds.yaml index 723ed3f..4bcd725 100644 --- a/jjb/yaml_builds/yaml_builds.yaml +++ b/jjb/yaml_builds/yaml_builds.yaml @@ -29,4 +29,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml index 57bd951..2059b30 100644 --- a/packer/provision/helm.yaml +++ b/packer/provision/helm.yaml @@ -36,7 +36,7 @@ url: https://storage.googleapis.com/kubernetes-release/release/v{{kubectl_version}}/bin/linux/amd64/kubectl dest: /usr/local/bin/kubectl mode: 0775 - become: yes + become: true - name: "Install Helm {{helm_version}}" block: @@ -49,10 +49,10 @@ src: /tmp/helm-v{{helm_version}}-linux-amd64.tar.gz dest: /tmp remote_src: true - become: yes + become: true - name: "Move helm to /usr/local/bin and set as executable" command: "mv /tmp/linux-amd64/helm /usr/local/bin/helm" - become: yes + become: true - name: "Check helm." command: "which helm" - name: "Check kubectl." -- 2.16.6 From 292e2c33886b8be563dbc7ae2c1765c6422b634f Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 11 May 2023 21:33:20 +1000 Subject: [PATCH 08/16] Refactor: Add pre-commit config and update tox Signed-off-by: Anil Belur Change-Id: Id21a2886d92a0429de04f8e4321e19319c4d4f0d --- .coafile | 34 ----------------- .gitlint | 97 +++++++++++++++++++++++++++++++++++++++++++++++++ .pre-commit-config.yaml | 32 ++++++++++++++++ .yamllint | 11 ++++++ .yamllint.conf | 7 ---- tox.ini | 54 ++++++++++++++++++++++----- 6 files changed, 185 insertions(+), 50 deletions(-) delete mode 100644 .coafile create mode 100644 .gitlint create mode 100644 .pre-commit-config.yaml create mode 100644 .yamllint delete mode 100644 .yamllint.conf diff --git a/.coafile b/.coafile deleted file mode 100644 index f0abad4..0000000 --- a/.coafile +++ /dev/null @@ -1,34 +0,0 @@ -[Documentation] -bears = WriteGoodLintBear -files = *.md -allow_so_beginning = False -allow_there_is = False -allow_cliche_phrases = False - -[GitCommit] -bears = GitCommitBear -ignore_length_regex = Signed-off-by, - Also-by, - Co-authored-by, - http://, - https:// - -[JSON] -bears = JSONFormatBear -files = packer/**.json -indent_size = 2 - -[ShellCheck] -bears = ShellCheckBear, - SpaceConsistencyBear -files = jjb/**.sh, - packer/**.sh -shell = bash -indent_size = 4 -use_spaces = yeah - -[YAML] -bears = YAMLLintBear -files = jjb/**/*.yaml -document_start = True -yamllint_config = .yamllint.conf diff --git a/.gitlint b/.gitlint new file mode 100644 index 0000000..8d37da1 --- /dev/null +++ b/.gitlint @@ -0,0 +1,97 @@ +# All these sections are optional, edit this file as you like. +[general] +# Ignore certain rules, you can reference them by their id or by their full +# name +# ignore=title-trailing-punctuation, T3 + +# verbosity should be a value between 1 and 3, the command line -v flags take +# precedence over this +# verbosity = 2 + +# By default gitlint will ignore merge commits. Set to 'false' to disable. +# ignore-merge-commits=true + +# By default gitlint will ignore fixup commits. Set to 'false' to disable. +# ignore-fixup-commits=true + +# By default gitlint will ignore squash commits. Set to 'false' to disable. +# ignore-squash-commits=true + +# Enable debug mode (prints more output). Disabled by default. +# debug=true + +# Set the extra-path where gitlint will search for user defined rules +# See http://jorisroovers.github.io/gitlint/user_defined_rules for details +# extra-path=examples/ + +# contrib=contrib-title-conventional-commits,contrib-body-requires-signed-off-by +contrib=contrib-body-requires-signed-off-by + +# [title-max-length] +# line-length=80 + +# [title-must-not-contain-word] +# Comma-separated list of words that should not occur in the title. Matching is +# case insensitive. It's fine if the keyword occurs as part of a larger word +# (so "WIPING" will not cause a violation, but "WIP: my title" will. +# words=wip + +# [title-match-regex] +# python like regex (https://docs.python.org/2/library/re.html) that the +# commit-msg title must be matched to. +# Note that the regex can contradict with other rules if not used correctly +# (e.g. title-must-not-contain-word). +# regex=^US[0-9]* + +# [B1] +# B1 = body-max-line-length +# line-length=120 + +# [body-min-length] +# min-length=5 + +# [body-is-missing] +# Whether to ignore this rule on merge commits (which typically only have a title) +# default = True +# ignore-merge-commits=false + +# [body-changed-file-mention] +# List of files that need to be explicitly mentioned in the body when they are +# changed This is useful for when developers often erroneously edit certain +# files or git submodules. By specifying this rule, developers can only change +# the file when they explicitly reference it in the commit message. +# files=gitlint/rules.py,README.md + +# [author-valid-email] +# python like regex (https://docs.python.org/2/library/re.html) that the +# commit author email address should be matched to +# For example, use the following regex if you only want to allow email +# addresses from foo.com +# regex=[^@]+@foo.com + +# [ignore-by-title] +# Ignore certain rules for commits of which the title matches a regex +# E.g. Match commit titles that start with "Release" +# regex=^Release(.*) +# +# Ignore certain rules, you can reference them by their id or by their full name +# Use 'all' to ignore all rules +# ignore=T1,body-min-length + +# [ignore-by-body] +# Ignore certain rules for commits of which the body has a line that matches a +# regex +# E.g. Match bodies that have a line that contain "release" +# regex=(.*)release(.*) +# +# Ignore certain rules, you can reference them by their id or by their full name +# Use 'all' to ignore all rules +# ignore=T1,body-min-length + +# Enable Conventional Commit subject line enforcement +# https://www.conventionalcommits.org/en/v1.0.0/ +# +# Since we want all subjects to be well formed, enforce the topics +# to the following (fairly standard) topics and require them to be Mixed Case +# [contrib-title-conventional-commits] +# types=Fix,Feat,Chore,Docs,Style,Refactor,Perf,Test,Revert,CI,Build diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..ca94141 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,32 @@ +--- +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.4.0 + hooks: + - id: trailing-whitespace + - id: check-executables-have-shebangs + stages: [manual] + - id: check-json + exclude: (.vscode|.devcontainer) + - id: no-commit-to-branch + args: + - --branch=dev + - --branch=master + - --branch=main + - --branch=rc + + - repo: https://github.com/jorisroovers/gitlint + rev: v0.19.1 + hooks: + - id: gitlint + + - repo: https://github.com/adrienverge/yamllint.git + rev: v1.31.0 + hooks: + - id: yamllint + + - repo: https://github.com/pre-commit/mirrors-prettier + rev: v3.0.0-alpha.9-for-vscode + hooks: + - id: prettier + stages: [commit] diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..d4497f8 --- /dev/null +++ b/.yamllint @@ -0,0 +1,11 @@ +--- +extends: default + +rules: + empty-lines: + max-end: 1 + line-length: + max: 120 + comments: + # prettier forces 1 space comment separator + min-spaces-from-content: 1 diff --git a/.yamllint.conf b/.yamllint.conf deleted file mode 100644 index b821cb8..0000000 --- a/.yamllint.conf +++ /dev/null @@ -1,7 +0,0 @@ -extends: default - -rules: - empty-lines: - max-end: 1 - line-length: - max: 120 diff --git a/tox.ini b/tox.ini index e33d587..5dad540 100644 --- a/tox.ini +++ b/tox.ini @@ -1,16 +1,52 @@ [tox] minversion = 1.6 -envlist = coala +envlist = pre-commit skipsdist = true -[testenv:coala] +[testenv:jenkins-jobs] +deps = + jenkins-job-builder=={env:JJB_VERSION:5.0.2} +commands = + jenkins-jobs {posargs:--help} + + +[testenv:pre-commit-install] basepython = python3 +deps = pre-commit +commands = + pre-commit install + pre-commit install --hook-type commit-msg + +[testenv:pre-commit-uninstall] +basepython = python3 +deps = pre-commit +commands = + pre-commit uninstall + pre-commit uninstall --hook-type commit-msg + +[testenv:pre-commit] +description = Precommit checks for black, gitlint, etc. +allowlist_externals = + /bin/sh deps = - coala==0.11 - coala-bears==0.11 - nodeenv~=1.3.0 + pre-commit +passenv = HOME commands = - nodeenv -p - npm install --global write-good - python3 -m nltk.downloader punkt maxent_treebank_pos_tagger averaged_perceptron_tagger - coala --non-interactive + pre-commit run --all-files --show-diff-on-failure + /bin/sh -c 'if ! git config --get user.name > /dev/null; then \ + git config --global --add user.name "CI"; \ + touch .git/REMOVE_USERNAME; fi' + /bin/sh -c 'if ! git config --get user.email > /dev/null; then \ + git config --global --add user.email "ci@example.org"; \ + touch .git/REMOVE_USEREMAIL; fi' + /bin/sh -c "if [ -f .git/COMMIT_EDITMSG ]; then \ + cp .git/COMMIT_EDITMSG .git/COMMIT_MSGTOX; else \ + git log HEAD -n1 --pretty=%B > .git/COMMIT_MSGTOX; fi" + pre-commit run gitlint --hook-stage commit-msg --commit-msg-filename .git/COMMIT_MSGTOX + /bin/sh -c "rm -f .git/COMMIT_MSGTOX" + /bin/sh -c "if [ -f .git/REMOVE_USERNAME ]; then \ + git config --global --unset user.name; \ + rm -f .git/REMOVE_USERNAME; fi" + /bin/sh -c "if [ -f .git/REMOVE_USEREMAIL ]; then \ + git config --global --unset user.email; \ + rm -f .git/REMOVE_USEREMAIL; fi" -- 2.16.6 From e8d34a09280de508893c29be286db14f029e8dda Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Thu, 11 May 2023 10:09:17 -0700 Subject: [PATCH 09/16] Chore: Remove outdated jobs These are no longer in use, and are attempting to use agents that are no longer connected to the Jenkins server. Change-Id: I2d632f236cfe5f16e8f1d04c57660686ced177a6 Signed-off-by: Eric Ball --- jjb/rec/rec.yaml | 38 ------------------------------- jjb/validation/validation-docker.yaml | 42 ----------------------------------- 2 files changed, 80 deletions(-) delete mode 100644 jjb/rec/rec.yaml delete mode 100644 jjb/validation/validation-docker.yaml diff --git a/jjb/rec/rec.yaml b/jjb/rec/rec.yaml deleted file mode 100644 index 0d8ef96..0000000 --- a/jjb/rec/rec.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -- project: - name: "rec" - project-name: "rec" - project: "{project-name}" - views: - - project-view - # ------------------------------- - # BRANCH DEFINITIONS - # ------------------------------- - stream: - - master: - branch: master - disabled: false - - # ------------------------------- - # USECASE DEFINITIONS - # ------------------------------- - usecase: - - seba_on_arm - - phase: - - install - - test - - # ------------------------------- - # POD DEFINITIONS - # ------------------------------- - slave_label: - - aarch64_baremetal - - job_frequency: - - weekly - - jobs: - - akraino-rec-deploy - - akraino-rec-install-rec - - akraino-usecase-phase-rec diff --git a/jjb/validation/validation-docker.yaml b/jjb/validation/validation-docker.yaml deleted file mode 100644 index 88fa8f8..0000000 --- a/jjb/validation/validation-docker.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -- project: - name: validation-docker - project: validation - mvn-settings: validation-settings - stream: - - 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: "ubuntu1804-docker-8c-8g" - - "arm64": - slave_label: "aarch64_build" - - jobs: - - akraino-validation-docker-multiarch - - akraino-validation-docker-specific-arch - - akraino-validation-docker-manifest -- 2.16.6 From 92504332451d9301432e4d2aa601eb39fcfbf0a0 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Fri, 1 Dec 2023 15:44:44 -0800 Subject: [PATCH 10/16] CI: Modify GHA workflow to use composed verify This uses a single workflow composed of all actions that need to be run to verify changes to the ci-management repo. Issue: RELENG-4799 Change-Id: Ibe2ef9732c7d0a9e13e30fec2cb8c3b64bad1768 Signed-off-by: Eric Ball --- .github/workflows/gerrit-verify.yaml | 124 ++++++++--------------------------- 1 file changed, 26 insertions(+), 98 deletions(-) diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml index ea754d8..cd06381 100644 --- a/.github/workflows/gerrit-verify.yaml +++ b/.github/workflows/gerrit-verify.yaml @@ -1,5 +1,5 @@ --- -name: Gerrit Verify +name: Call Composed ci-management Verify # yamllint disable-line rule:truthy on: @@ -41,102 +41,30 @@ on: description: "Gerrit refspec of change" required: true type: string - -concurrency: - group: ${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }} - cancel-in-progress: true + ENV_VARS: + # yamllint disable-line rule:line-length + description: "Pass GitHub variables to be exported as environment variables via `toJSON(vars)` or specific variables encoded in JSON format" + required: false + default: "{}" + type: string jobs: - prepare: - runs-on: ubuntu-latest - steps: - - name: Clear votes - uses: lfit/gerrit-review-action@v0.3 - with: - host: ${{ vars.GERRIT_SERVER }} - username: ${{ vars.GERRIT_SSH_USER }} - key: ${{ secrets.GERRIT_SSH_PRIVKEY }} - known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }} - gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }} - gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }} - vote-type: clear - - name: Allow replication - run: sleep 10s - - actionlint: - needs: prepare - runs-on: ubuntu-latest - steps: - - uses: lfit/checkout-gerrit-change-action@v0.3 - with: - gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }} - delay: "0s" - - name: Download actionlint - id: get_actionlint - run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) - shell: bash - - name: Check workflow files - run: ${{ steps.get_actionlint.outputs.executable }} -color - shell: bash - - # run pre-commit tox env separately to get use of more parallel processing - pre-commit: - needs: prepare - runs-on: ubuntu-latest - steps: - - uses: lfit/checkout-gerrit-change-action@v0.3 - with: - gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }} - delay: "0s" - - uses: actions/setup-python@v4 - with: - python-version: "3.11" - - name: Run static analysis and format checkers - run: pipx run pre-commit run --all-files --show-diff-on-failure - - jjb-validation: - needs: prepare - runs-on: ubuntu-latest - steps: - - uses: lfit/checkout-gerrit-change-action@v0.3 - with: - gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }} - delay: "0s" - - uses: actions/setup-python@v4 - id: setup-python - with: - python-version: "3.11" - - name: Clone git submodules - run: git submodule update --init - - name: Run JJB Verify - run: | - python -m pip install --upgrade pip - pip install jenkins-job-builder - mkdir -p "${HOME}/.config/jenkins_jobs" - cat << EOF > "${HOME}/.config/jenkins_jobs/jenkins_jobs.ini" - [job_builder] - ignore_cache=True - keep_descriptions=False - include_path=. - recursive=True - query_plugins_info=False - config-xml=True - EOF - jenkins-jobs test -o archives/job-configs jjb/ - - vote: - if: ${{ always() }} - needs: [prepare, actionlint, pre-commit, jjb-validation] - runs-on: ubuntu-latest - steps: - - uses: technote-space/workflow-conclusion-action@v3 - - name: Set vote - uses: lfit/gerrit-review-action@v0.3 - with: - host: ${{ vars.GERRIT_SERVER }} - username: ${{ vars.GERRIT_SSH_USER }} - key: ${{ secrets.GERRIT_SSH_PRIVKEY }} - known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }} - gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }} - gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }} - vote-type: ${{ env.WORKFLOW_CONCLUSION }} + call-composed-ci-man-verify: + # yamllint disable-line rule:line-length + uses: lfit/releng-reusable-workflows/.github/workflows/composed-ci-management-verify.yaml@25511233afffc28b7dcb71c89ccc1b66acba2449 # v0.2.0 + with: + GERRIT_BRANCH: ${{ inputs.GERRIT_BRANCH }} + GERRIT_CHANGE_ID: ${{ inputs.GERRIT_CHANGE_ID }} + GERRIT_CHANGE_NUMBER: ${{ inputs.GERRIT_CHANGE_NUMBER }} + GERRIT_CHANGE_URL: ${{ inputs.GERRIT_CHANGE_URL }} + GERRIT_EVENT_TYPE: ${{ inputs.GERRIT_EVENT_TYPE }} + GERRIT_PATCHSET_NUMBER: ${{ inputs.GERRIT_PATCHSET_NUMBER }} + GERRIT_PATCHSET_REVISION: ${{ inputs.GERRIT_PATCHSET_REVISION }} + GERRIT_PROJECT: ${{ inputs.GERRIT_PROJECT }} + GERRIT_REFSPEC: ${{ inputs.GERRIT_REFSPEC }} + ENV_VARS: ${{ toJSON(vars) }} + secrets: + GERRIT_SSH_PRIVKEY: ${{ secrets.GERRIT_SSH_PRIVKEY }} + ENV_SECRETS: ${{ toJSON(secrets) }} + CLOUDS_ENV_B64: ${{ secrets.CLOUDS_ENV_B64 }} + CLOUDS_YAML_B64: ${{ secrets.CLOUDS_ENV_B64 }} -- 2.16.6 From ace225fdfdb43045024c331bf4965971576809d0 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Mon, 11 Dec 2023 17:03:40 -0800 Subject: [PATCH 11/16] CI: Remove JJB jobs for inactive projects These projects are going to be archived. All related jobs can be removed from our CI configuration. Change-Id: I17a1f6995e5ad7956216d07b39a6b6eb820fc957 Issue-ID: LF-Jira RELENG-4799 Signed-off-by: Eric Ball --- .../5g-mec-cloud-gaming-verify.yaml | 11 --- jjb/5g-mec-cloud-gaming/5g-mec-cloud-gaming.yaml | 14 ---- jjb/addon-onap/addon-onap.yaml | 32 --------- jjb/addon-onap/info-addon-onap.yaml | 9 --- jjb/addon-snappy/info-addon-snappy.yaml | 9 --- .../airshipinabottle_deploy.yaml | 32 --------- .../info-airshipinabottle_deploy.yaml | 9 --- .../akraino-5g-mec-templates.yaml | 79 ---------------------- jjb/camunda_workflow/camunda_workflow-docker.yaml | 34 ---------- jjb/camunda_workflow/camunda_workflow.yaml | 34 ---------- jjb/camunda_workflow/info-camunda_workflow.yaml | 9 --- jjb/chomp/chomp.yaml | 6 -- jjb/chomp/info-chomp.yaml | 9 --- jjb/connected-vehicle/info-connected-vehicle.yaml | 9 --- jjb/evp/evp.yaml | 6 -- jjb/evp/info-evp.yaml | 9 --- jjb/icn/icn-daaas.yaml | 43 ------------ jjb/mec-api-framework/info-mec-api-framework.yaml | 9 --- jjb/nc/info-nc.yaml | 9 --- jjb/nc/nc-ovs-dpdk-unicycle.yaml | 17 ----- jjb/nc/nc.yaml | 6 -- jjb/ovs-dpdk-airship/info-ovs-dpdk-airship.yaml | 9 --- jjb/portal/info-portal.yaml | 9 --- jjb/portal/portal.yaml | 6 -- .../info-portal_user_interface.yaml | 9 --- .../portal-onapsdk-docker.yaml | 34 ---------- jjb/portal_user_interface/portal-onapsdk.yaml | 42 ------------ .../portal_user_interface-docker.yaml | 34 ---------- .../portal_user_interface.yaml | 34 ---------- .../info-postgres_db_schema.yaml | 9 --- jjb/postgres_db_schema/postgres_db_schema.yaml | 36 ---------- jjb/rec/info-rec.yaml | 9 --- jjb/redfish/info-redfish.yaml | 9 --- jjb/redfish/redfish-docker.yaml | 34 ---------- jjb/redfish/redfish.yaml | 32 --------- jjb/regional_controller/api-server-docker.yaml | 34 ---------- jjb/regional_controller/api-server.yaml | 34 ---------- .../info-regional_controller.yaml | 9 --- jjb/regional_controller/regional_controller.yaml | 32 --------- .../info-remote-server-os-bootstrap.yaml | 9 --- jjb/repo-beta/info-repo-beta.yaml | 9 --- jjb/sample_vnf/info-sample_vnf.yaml | 9 --- jjb/sample_vnf/sample_vnf.yaml | 32 --------- jjb/serverless/info-serverless.yaml | 9 --- jjb/starlingx/info-starlingx.yaml | 9 --- jjb/starlingx/starlingx.yaml | 14 ---- jjb/ta/access-management.yaml | 25 ------- jjb/ta/ansible-role-ntp.yaml | 25 ------- jjb/ta/caas-cpupooler.yaml | 25 ------- jjb/ta/caas-danm.yaml | 25 ------- jjb/ta/caas-etcd.yaml | 25 ------- jjb/ta/caas-helm.yaml | 25 ------- jjb/ta/caas-install.yaml | 25 ------- jjb/ta/caas-kubedns.yaml | 25 ------- jjb/ta/caas-lcm.yaml | 25 ------- jjb/ta/caas-logging.yaml | 25 ------- jjb/ta/caas-metrics.yaml | 25 ------- jjb/ta/caas-registry.yaml | 25 ------- jjb/ta/caas-security.yaml | 25 ------- jjb/ta/caas-storage.yaml | 25 ------- jjb/ta/ci-build.yaml | 20 ------ jjb/ta/cloudtaf.yaml | 23 ------- jjb/ta/cm-plugins.yaml | 25 ------- jjb/ta/config-manager.yaml | 25 ------- jjb/ta/distributed-state-server.yaml | 25 ------- jjb/ta/hostcli.yaml | 25 ------- jjb/ta/hw-detector.yaml | 25 ------- jjb/ta/image-provision.yaml | 25 ------- jjb/ta/ipa-deployer.yaml | 25 ------- jjb/ta/ironic-virtmedia-driver.yaml | 25 ------- jjb/ta/ironic.yaml | 25 ------- jjb/ta/ironicclient.yaml | 25 ------- jjb/ta/lockcli.yaml | 25 ------- jjb/ta/monitoring.yaml | 25 ------- jjb/ta/openstack-ansible-galera_client.yaml | 25 ------- jjb/ta/openstack-ansible-galera_server.yaml | 25 ------- jjb/ta/openstack-ansible-haproxy_server.yaml | 25 ------- jjb/ta/openstack-ansible-memcached_server.yaml | 25 ------- jjb/ta/openstack-ansible-openstack_openrc.yaml | 25 ------- jjb/ta/openstack-ansible-os_ironic.yaml | 25 ------- jjb/ta/openstack-ansible-os_keystone.yaml | 25 ------- jjb/ta/openstack-ansible-plugins.yaml | 25 ------- jjb/ta/openstack-ansible-rabbitmq_server.yaml | 25 ------- jjb/ta/openstack-ansible-rsyslog_client.yaml | 25 ------- jjb/ta/openstack-ansible.yaml | 25 ------- jjb/ta/os-net-config.yaml | 25 ------- jjb/ta/python-ilorest-library.yaml | 25 ------- jjb/ta/python-peewee.yaml | 25 ------- jjb/ta/remote-installer.yaml | 19 ------ jjb/ta/rpmbuilder.yaml | 22 ------ jjb/ta/start-menu.yaml | 25 ------- jjb/ta/storage.yaml | 25 ------- jjb/ta/yarf.yaml | 25 ------- jjb/tami/tami.yaml | 14 ---- jjb/tc/info-tc.yaml | 9 --- jjb/tc/tc.yaml | 6 -- jjb/test_automation/info-test_automation.yaml | 9 --- jjb/test_automation/test_automation.yaml | 32 --------- jjb/umec/info-umec.yaml | 9 --- jjb/umec/umec.yaml | 6 -- jjb/yaml_builds/info-yaml_builds.yaml | 9 --- jjb/yaml_builds/yaml_builds.yaml | 32 --------- 102 files changed, 2186 deletions(-) delete mode 100644 jjb/5g-mec-cloud-gaming/5g-mec-cloud-gaming-verify.yaml delete mode 100644 jjb/5g-mec-cloud-gaming/5g-mec-cloud-gaming.yaml delete mode 100644 jjb/addon-onap/addon-onap.yaml delete mode 100644 jjb/addon-onap/info-addon-onap.yaml delete mode 100644 jjb/addon-snappy/info-addon-snappy.yaml delete mode 100644 jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml delete mode 100644 jjb/airshipinabottle_deploy/info-airshipinabottle_deploy.yaml delete mode 100644 jjb/akraino-templates/akraino-5g-mec-templates.yaml delete mode 100644 jjb/camunda_workflow/camunda_workflow-docker.yaml delete mode 100644 jjb/camunda_workflow/camunda_workflow.yaml delete mode 100644 jjb/camunda_workflow/info-camunda_workflow.yaml delete mode 100644 jjb/chomp/chomp.yaml delete mode 100644 jjb/chomp/info-chomp.yaml delete mode 100644 jjb/connected-vehicle/info-connected-vehicle.yaml delete mode 100644 jjb/evp/evp.yaml delete mode 100644 jjb/evp/info-evp.yaml delete mode 100644 jjb/icn/icn-daaas.yaml delete mode 100644 jjb/mec-api-framework/info-mec-api-framework.yaml delete mode 100644 jjb/nc/info-nc.yaml delete mode 100644 jjb/nc/nc-ovs-dpdk-unicycle.yaml delete mode 100644 jjb/nc/nc.yaml delete mode 100644 jjb/ovs-dpdk-airship/info-ovs-dpdk-airship.yaml delete mode 100644 jjb/portal/info-portal.yaml delete mode 100644 jjb/portal/portal.yaml delete mode 100644 jjb/portal_user_interface/info-portal_user_interface.yaml delete mode 100644 jjb/portal_user_interface/portal-onapsdk-docker.yaml delete mode 100644 jjb/portal_user_interface/portal-onapsdk.yaml delete mode 100644 jjb/portal_user_interface/portal_user_interface-docker.yaml delete mode 100644 jjb/portal_user_interface/portal_user_interface.yaml delete mode 100644 jjb/postgres_db_schema/info-postgres_db_schema.yaml delete mode 100644 jjb/postgres_db_schema/postgres_db_schema.yaml delete mode 100644 jjb/rec/info-rec.yaml delete mode 100644 jjb/redfish/info-redfish.yaml delete mode 100644 jjb/redfish/redfish-docker.yaml delete mode 100644 jjb/redfish/redfish.yaml delete mode 100644 jjb/regional_controller/api-server-docker.yaml delete mode 100644 jjb/regional_controller/api-server.yaml delete mode 100644 jjb/regional_controller/info-regional_controller.yaml delete mode 100644 jjb/regional_controller/regional_controller.yaml delete mode 100644 jjb/remote-server-os-bootstrap/info-remote-server-os-bootstrap.yaml delete mode 100644 jjb/repo-beta/info-repo-beta.yaml delete mode 100644 jjb/sample_vnf/info-sample_vnf.yaml delete mode 100644 jjb/sample_vnf/sample_vnf.yaml delete mode 100644 jjb/serverless/info-serverless.yaml delete mode 100644 jjb/starlingx/info-starlingx.yaml delete mode 100644 jjb/starlingx/starlingx.yaml delete mode 100644 jjb/ta/access-management.yaml delete mode 100644 jjb/ta/ansible-role-ntp.yaml delete mode 100644 jjb/ta/caas-cpupooler.yaml delete mode 100644 jjb/ta/caas-danm.yaml delete mode 100644 jjb/ta/caas-etcd.yaml delete mode 100644 jjb/ta/caas-helm.yaml delete mode 100644 jjb/ta/caas-install.yaml delete mode 100644 jjb/ta/caas-kubedns.yaml delete mode 100644 jjb/ta/caas-lcm.yaml delete mode 100644 jjb/ta/caas-logging.yaml delete mode 100644 jjb/ta/caas-metrics.yaml delete mode 100644 jjb/ta/caas-registry.yaml delete mode 100644 jjb/ta/caas-security.yaml delete mode 100644 jjb/ta/caas-storage.yaml delete mode 100644 jjb/ta/ci-build.yaml delete mode 100644 jjb/ta/cloudtaf.yaml delete mode 100644 jjb/ta/cm-plugins.yaml delete mode 100644 jjb/ta/config-manager.yaml delete mode 100644 jjb/ta/distributed-state-server.yaml delete mode 100644 jjb/ta/hostcli.yaml delete mode 100644 jjb/ta/hw-detector.yaml delete mode 100644 jjb/ta/image-provision.yaml delete mode 100644 jjb/ta/ipa-deployer.yaml delete mode 100644 jjb/ta/ironic-virtmedia-driver.yaml delete mode 100644 jjb/ta/ironic.yaml delete mode 100644 jjb/ta/ironicclient.yaml delete mode 100644 jjb/ta/lockcli.yaml delete mode 100644 jjb/ta/monitoring.yaml delete mode 100644 jjb/ta/openstack-ansible-galera_client.yaml delete mode 100644 jjb/ta/openstack-ansible-galera_server.yaml delete mode 100644 jjb/ta/openstack-ansible-haproxy_server.yaml delete mode 100644 jjb/ta/openstack-ansible-memcached_server.yaml delete mode 100644 jjb/ta/openstack-ansible-openstack_openrc.yaml delete mode 100644 jjb/ta/openstack-ansible-os_ironic.yaml delete mode 100644 jjb/ta/openstack-ansible-os_keystone.yaml delete mode 100644 jjb/ta/openstack-ansible-plugins.yaml delete mode 100644 jjb/ta/openstack-ansible-rabbitmq_server.yaml delete mode 100644 jjb/ta/openstack-ansible-rsyslog_client.yaml delete mode 100644 jjb/ta/openstack-ansible.yaml delete mode 100644 jjb/ta/os-net-config.yaml delete mode 100644 jjb/ta/python-ilorest-library.yaml delete mode 100644 jjb/ta/python-peewee.yaml delete mode 100644 jjb/ta/remote-installer.yaml delete mode 100644 jjb/ta/rpmbuilder.yaml delete mode 100644 jjb/ta/start-menu.yaml delete mode 100644 jjb/ta/storage.yaml delete mode 100644 jjb/ta/yarf.yaml delete mode 100644 jjb/tami/tami.yaml delete mode 100644 jjb/tc/info-tc.yaml delete mode 100644 jjb/tc/tc.yaml delete mode 100644 jjb/test_automation/info-test_automation.yaml delete mode 100644 jjb/test_automation/test_automation.yaml delete mode 100644 jjb/umec/info-umec.yaml delete mode 100644 jjb/umec/umec.yaml delete mode 100644 jjb/yaml_builds/info-yaml_builds.yaml delete mode 100644 jjb/yaml_builds/yaml_builds.yaml diff --git a/jjb/5g-mec-cloud-gaming/5g-mec-cloud-gaming-verify.yaml b/jjb/5g-mec-cloud-gaming/5g-mec-cloud-gaming-verify.yaml deleted file mode 100644 index 68d55d3..0000000 --- a/jjb/5g-mec-cloud-gaming/5g-mec-cloud-gaming-verify.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- project: - name: 5g-mec-cloud-gaming - project: 5g-mec-cloud-gaming - project-name: 5g-mec-cloud-gaming - build-node: centos7-builder-2c-1g - stream: - - master: - branch: master - jobs: - - 5g-mec-project-stream-verify diff --git a/jjb/5g-mec-cloud-gaming/5g-mec-cloud-gaming.yaml b/jjb/5g-mec-cloud-gaming/5g-mec-cloud-gaming.yaml deleted file mode 100644 index ba84140..0000000 --- a/jjb/5g-mec-cloud-gaming/5g-mec-cloud-gaming.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: 5g-mec-cloud-gaming-project-view - project-name: 5g-mec-cloud-gaming - views: - - project-view - -- project: - name: 5g-mec-cloud-gaming-info - project: 5g-mec-cloud-gaming - project-name: 5g-mec-cloud-gaming - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify diff --git a/jjb/addon-onap/addon-onap.yaml b/jjb/addon-onap/addon-onap.yaml deleted file mode 100644 index c5b26af..0000000 --- a/jjb/addon-onap/addon-onap.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - name: addon-onap - project-name: addon-onap - project: addon-onap - build-node: centos7-builder-2c-1g - stream: master - mvn-settings: addon-onap-settings - group-id: org.akraino.addon-onap - refspec: refs/heads/master - branch: master - jobs: - - akraino-project-stream-release-config - - akraino-project-stream-stage-config - views: - - project-view - cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/addon-onap/info-addon-onap.yaml b/jjb/addon-onap/info-addon-onap.yaml deleted file mode 100644 index 36a48b9..0000000 --- a/jjb/addon-onap/info-addon-onap.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: addon-onap-info - project-name: addon-onap - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: addon-onap - branch: master diff --git a/jjb/addon-snappy/info-addon-snappy.yaml b/jjb/addon-snappy/info-addon-snappy.yaml deleted file mode 100644 index 186939d..0000000 --- a/jjb/addon-snappy/info-addon-snappy.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: addon-snappy-info - project-name: addon-snappy - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: addon-snappy - branch: master diff --git a/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml b/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml deleted file mode 100644 index 0ec2cf1..0000000 --- a/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - name: airshipinabottle_deploy - project-name: airshipinabottle_deploy - project: airshipinabottle_deploy - build-node: centos7-builder-2c-1g - stream: master - mvn-settings: airshipinabottle_deploy-settings - group-id: org.akraino.airshipinabottle_deploy - refspec: refs/heads/master - branch: master - jobs: - - akraino-project-stream-release-config - - akraino-project-stream-stage-config - views: - - project-view - cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/airshipinabottle_deploy/info-airshipinabottle_deploy.yaml b/jjb/airshipinabottle_deploy/info-airshipinabottle_deploy.yaml deleted file mode 100644 index c7ffa94..0000000 --- a/jjb/airshipinabottle_deploy/info-airshipinabottle_deploy.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: airshipinabottle_deploy-info - project-name: airshipinabottle_deploy - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: airshipinabottle_deploy - branch: master diff --git a/jjb/akraino-templates/akraino-5g-mec-templates.yaml b/jjb/akraino-templates/akraino-5g-mec-templates.yaml deleted file mode 100644 index 423e2b5..0000000 --- a/jjb/akraino-templates/akraino-5g-mec-templates.yaml +++ /dev/null @@ -1,79 +0,0 @@ ---- -- job-template: - id: 5g-mec-project-stream-verify - name: "{project-name}-{stream}-verify" - archive-artifacts: > - **/*.log - build-days-to-keep: 30 - build-timeout: 60 - stream: master - project-type: freestyle - submodule-recursive: true - node: "{build-node}" - - properties: - - lf-infra-properties: - build-days-to-keep: "{build-days-to-keep}" - - parameters: - - lf-infra-parameters: - project: "{project}" - stream: "{stream}" - branch: "{branch}" - lftools-version: "{lftools-version}" - - - string: - name: ARCHIVE_ARTIFACTS - default: "{archive-artifacts}" - description: Artifacts to archive to the logs server. - - wrappers: - - lf-infra-wrappers: - build-timeout: "{build-timeout}" - jenkins-ssh-credential: "{jenkins-ssh-credential}" - - scm: - - lf-infra-gerrit-scm: - jenkins-ssh-credential: "{jenkins-ssh-credential}" - git-url: "{git-url}/{project}.git" - refspec: "$GERRIT_REFSPEC" - branch: "$GERRIT_BRANCH" - submodule-recursive: "{submodule-recursive}" - submodule-timeout: "{submodule-timeout}" - submodule-disable: false - choosing-strategy: "gerrit" - - triggers: - - gerrit: - server-name: "{gerrit-server-name}" - trigger-on: - - patchset-created-event: - exclude-drafts: "false" - exclude-trivial-rebase: "false" - exclude-no-code-change: "false" - - change-merged-event - - draft-published-event - - comment-added-contains-event: - comment-contains-value: "recheck" - - comment-added-contains-event: - comment-contains-value: "reverify" - projects: - - project-compare-type: "ANT" - project-pattern: "{project}" - branches: - - branch-compare-type: "ANT" - branch-pattern: "**/{branch}" - disable-strict-forbidden-file-verification: "true" - forbidden-file-paths: - - compare-type: ANT - pattern: "docs/**" - - compare-type: REG_EXP - pattern: "INFO.yaml" - readable-message: true - - builders: - - shell: !include-raw-escape: - - ../shell/verify.sh - - publishers: - - lf-infra-publish diff --git a/jjb/camunda_workflow/camunda_workflow-docker.yaml b/jjb/camunda_workflow/camunda_workflow-docker.yaml deleted file mode 100644 index 4e9dea6..0000000 --- a/jjb/camunda_workflow/camunda_workflow-docker.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - name: camunda_workflow-docker - project-name: camunda_workflow - project: camunda_workflow - global-settings-file: global-settings - build-node: ubuntu1804-docker-8c-8g - stream: master - java-version: openjdk8 - mvn-version: mvn35 - mvn-opts: "" - mvn-params: "-f akraino" - mvn-settings: camunda_workflow-settings - build-timeout: 60 - submodule-recursive: true - branch: master - jobs: - - "akraino-project-stream-docker" - - "akraino-project-stream-stage-docker" diff --git a/jjb/camunda_workflow/camunda_workflow.yaml b/jjb/camunda_workflow/camunda_workflow.yaml deleted file mode 100644 index 7a30a53..0000000 --- a/jjb/camunda_workflow/camunda_workflow.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - name: camunda_workflow - project: camunda_workflow - project-name: camunda_workflow - mvn-settings: camunda_workflow-settings - mvn-params: "-f akraino" - nexus-iq-namespace: "akraino-" - sonarcloud: true - sonarcloud-project-organization: "{sonarcloud_project_organization}" - sonarcloud-api-token: "{sonarcloud_api_token}" - sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" - build-node: centos7-builder-2c-1g - stream: master - jobs: - - "{project-name}-maven-jobs" - - gerrit-maven-sonar - views: - - project-view diff --git a/jjb/camunda_workflow/info-camunda_workflow.yaml b/jjb/camunda_workflow/info-camunda_workflow.yaml deleted file mode 100644 index 675cb75..0000000 --- a/jjb/camunda_workflow/info-camunda_workflow.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: camunda_workflow-info - project-name: camunda_workflow - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: camunda_workflow - branch: master diff --git a/jjb/chomp/chomp.yaml b/jjb/chomp/chomp.yaml deleted file mode 100644 index 2a10277..0000000 --- a/jjb/chomp/chomp.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- project: - name: chomp-project-view - project-name: chomp - views: - - project-view diff --git a/jjb/chomp/info-chomp.yaml b/jjb/chomp/info-chomp.yaml deleted file mode 100644 index a55c7b2..0000000 --- a/jjb/chomp/info-chomp.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: chomp-info - project-name: chomp - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: chomp - branch: master diff --git a/jjb/connected-vehicle/info-connected-vehicle.yaml b/jjb/connected-vehicle/info-connected-vehicle.yaml deleted file mode 100644 index 9542f10..0000000 --- a/jjb/connected-vehicle/info-connected-vehicle.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: connected-vehicle-info - project-name: connected-vehicle - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: connected-vehicle - branch: master diff --git a/jjb/evp/evp.yaml b/jjb/evp/evp.yaml deleted file mode 100644 index c76f80e..0000000 --- a/jjb/evp/evp.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- project: - name: evp-project-view - project-name: evp - views: - - project-view diff --git a/jjb/evp/info-evp.yaml b/jjb/evp/info-evp.yaml deleted file mode 100644 index 65665cb..0000000 --- a/jjb/evp/info-evp.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: evp-info - project-name: evp - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: evp - branch: master diff --git a/jjb/icn/icn-daaas.yaml b/jjb/icn/icn-daaas.yaml deleted file mode 100644 index 48ae6c8..0000000 --- a/jjb/icn/icn-daaas.yaml +++ /dev/null @@ -1,43 +0,0 @@ ---- -# -## Copyright (c) 2019 Intel Corporation -## -## Licensed under the Apache License, Version 2.0 (the "License"); you may -## not use this file except in compliance with the License. -## -## You may obtain a copy of the License at -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## -# -- project: - name: icn-daaas - project: "icn/daaas" - project-name: icn-daaas - build-node: ubuntu1804-helm-8c-32g - stream: - - master: - branch: master - type: - - golang: - path: microservices - script: |- - #!/bin/bash - cd $WORKSPACE/microservices - make all - - helm: - path: deploy - script: |- - #!/bin/bash - cd $WORKSPACE/deploy - make all - jobs: - - "{project-name}-{stream}-{type}-verify" - - "{project-name}-{stream}-{type}-merge" - views: - - project-view diff --git a/jjb/mec-api-framework/info-mec-api-framework.yaml b/jjb/mec-api-framework/info-mec-api-framework.yaml deleted file mode 100644 index d0feec8..0000000 --- a/jjb/mec-api-framework/info-mec-api-framework.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: mec-api-framework-info - project-name: mec-api-framework - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: mec-api-framework - branch: master diff --git a/jjb/nc/info-nc.yaml b/jjb/nc/info-nc.yaml deleted file mode 100644 index f5acd74..0000000 --- a/jjb/nc/info-nc.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: nc-info - project-name: nc - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: nc - branch: master diff --git a/jjb/nc/nc-ovs-dpdk-unicycle.yaml b/jjb/nc/nc-ovs-dpdk-unicycle.yaml deleted file mode 100644 index 75f7bd5..0000000 --- a/jjb/nc/nc-ovs-dpdk-unicycle.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- project: - name: nc-ovs-dpdk-unicycle - project-name: nc-ovs-dpdk-unicycle - project: nc-ovs-dpdk-unicycle - build-node: centos7-builder-2c-1g - stream: master - mvn-settings: nc-ovs-dpdk-unicycle-settings - group-id: org.akraino.nc-ovs-dpdk-unicycle - refspec: refs/heads/master - branch: master - jobs: - - akraino-project-stream-release-config - - akraino-project-stream-stage-config - views: - - project-view - cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/nc/nc.yaml b/jjb/nc/nc.yaml deleted file mode 100644 index 2fb254e..0000000 --- a/jjb/nc/nc.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- project: - name: nc-project-view - project-name: nc - views: - - project-view diff --git a/jjb/ovs-dpdk-airship/info-ovs-dpdk-airship.yaml b/jjb/ovs-dpdk-airship/info-ovs-dpdk-airship.yaml deleted file mode 100644 index 9757c49..0000000 --- a/jjb/ovs-dpdk-airship/info-ovs-dpdk-airship.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: ovs-dpdk-airship-info - project-name: ovs-dpdk-airship - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: ovs-dpdk-airship - branch: master diff --git a/jjb/portal/info-portal.yaml b/jjb/portal/info-portal.yaml deleted file mode 100644 index 9d04cd9..0000000 --- a/jjb/portal/info-portal.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: portal-info - project-name: portal - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: portal - branch: master diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml deleted file mode 100644 index ae86b09..0000000 --- a/jjb/portal/portal.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- project: - name: portal-project-view - project-name: portal - views: - - project-view diff --git a/jjb/portal_user_interface/info-portal_user_interface.yaml b/jjb/portal_user_interface/info-portal_user_interface.yaml deleted file mode 100644 index a34ae1e..0000000 --- a/jjb/portal_user_interface/info-portal_user_interface.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: portal_user_interface-info - project-name: portal_user_interface - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: portal_user_interface - branch: master diff --git a/jjb/portal_user_interface/portal-onapsdk-docker.yaml b/jjb/portal_user_interface/portal-onapsdk-docker.yaml deleted file mode 100644 index 459be14..0000000 --- a/jjb/portal_user_interface/portal-onapsdk-docker.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# -# Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - project-name: portal_user_interface-portal-onapsdk - project: "portal_user_interface/portal-onapsdk" - name: portal_user_interface-portal-onapsdk-docker - global-settings-file: global-settings - build-node: ubuntu1804-docker-8c-8g - stream: master - java-version: openjdk8 - mvn-version: mvn35 - mvn-opts: "" - mvn-params: "" - mvn-settings: portal_user_interface-settings - build-timeout: 60 - submodule-recursive: true - branch: master - jobs: - - "akraino-project-stream-docker" - - "akraino-project-stream-stage-docker" diff --git a/jjb/portal_user_interface/portal-onapsdk.yaml b/jjb/portal_user_interface/portal-onapsdk.yaml deleted file mode 100644 index 1f66fcb..0000000 --- a/jjb/portal_user_interface/portal-onapsdk.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# -# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - project: "portal_user_interface/portal-onapsdk" - project-name: portal_user_interface-portal-onapsdk - name: portal_user_interface-portal-onapsdk - build-node: centos7-builder-2c-1g - mvn-settings: portal_user_interface-settings - mvn-params: "" - nexus-iq-namespace: "akraino-" - sonarcloud: true - sonarcloud-project-organization: "{sonarcloud_project_organization}" - sonarcloud-api-token: "{sonarcloud_api_token}" - sonarcloud-project-key: "{sonarcloud_project_organization}_portal_user_interface" - stream: master - jobs: - - "gerrit-tox-verify": - parallel: false - submodule-disable: true - stream: - - master: - branch: "{stream}" - gs-pathname: "" - disabled: false - - "{project-name}-maven-jobs" - - gerrit-maven-sonar - views: - - project-view diff --git a/jjb/portal_user_interface/portal_user_interface-docker.yaml b/jjb/portal_user_interface/portal_user_interface-docker.yaml deleted file mode 100644 index 10c959f..0000000 --- a/jjb/portal_user_interface/portal_user_interface-docker.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - name: portal_user_interface-docker - project-name: portal_user_interface - project: portal_user_interface - global-settings-file: global-settings - build-node: ubuntu1804-docker-8c-8g - stream: master - java-version: openjdk8 - mvn-version: mvn35 - mvn-opts: "" - mvn-params: "-f AECPortalMgmt" - mvn-settings: portal_user_interface-settings - build-timeout: 60 - submodule-recursive: true - branch: master - jobs: - - "akraino-project-stream-docker" - - "akraino-project-stream-stage-docker" diff --git a/jjb/portal_user_interface/portal_user_interface.yaml b/jjb/portal_user_interface/portal_user_interface.yaml deleted file mode 100644 index 05f5120..0000000 --- a/jjb/portal_user_interface/portal_user_interface.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - name: portal_user_interface - project: portal_user_interface - project-name: portal_user_interface - mvn-settings: portal_user_interface-settings - mvn-params: "-f AECPortalMgmt" - nexus-iq-namespace: "akraino-" - sonarcloud: true - sonarcloud-project-organization: "{sonarcloud_project_organization}" - sonarcloud-api-token: "{sonarcloud_api_token}" - sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" - build-node: centos7-builder-2c-1g - stream: master - jobs: - - "{project-name}-maven-jobs" - - gerrit-maven-sonar - views: - - project-view diff --git a/jjb/postgres_db_schema/info-postgres_db_schema.yaml b/jjb/postgres_db_schema/info-postgres_db_schema.yaml deleted file mode 100644 index 9d0bc74..0000000 --- a/jjb/postgres_db_schema/info-postgres_db_schema.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: postgres_db_schema-info - project-name: postgres_db_schema - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: postgres_db_schema - branch: master diff --git a/jjb/postgres_db_schema/postgres_db_schema.yaml b/jjb/postgres_db_schema/postgres_db_schema.yaml deleted file mode 100644 index dfac4f8..0000000 --- a/jjb/postgres_db_schema/postgres_db_schema.yaml +++ /dev/null @@ -1,36 +0,0 @@ ---- -# -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - name: postgres_db_schema-docker - project-name: postgres_db_schema - project: postgres_db_schema - global-settings-file: global-settings - build-node: ubuntu1804-docker-8c-8g - stream: master - java-version: openjdk8 - mvn-version: mvn35 - mvn-opts: "" - mvn-params: "" - mvn-settings: postgres_db_schema-settings - build-timeout: 60 - submodule-recursive: true - branch: master - jobs: - - "akraino-project-stream-docker" - - "akraino-project-stream-stage-docker" - views: - - project-view diff --git a/jjb/rec/info-rec.yaml b/jjb/rec/info-rec.yaml deleted file mode 100644 index b6ddb55..0000000 --- a/jjb/rec/info-rec.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: rec-info - project-name: rec - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: rec - branch: master diff --git a/jjb/redfish/info-redfish.yaml b/jjb/redfish/info-redfish.yaml deleted file mode 100644 index acd0306..0000000 --- a/jjb/redfish/info-redfish.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: redfish-info - project-name: redfish - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: redfish - branch: master diff --git a/jjb/redfish/redfish-docker.yaml b/jjb/redfish/redfish-docker.yaml deleted file mode 100644 index 2977bcf..0000000 --- a/jjb/redfish/redfish-docker.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - name: redfish-docker - project-name: redfish - project: redfish - global-settings-file: global-settings - build-node: ubuntu1804-docker-8c-8g - stream: master - java-version: openjdk8 - mvn-version: mvn35 - mvn-opts: "" - mvn-params: "" - mvn-settings: redfish-settings - build-timeout: 60 - submodule-recursive: true - branch: master - jobs: - - "akraino-project-stream-docker" - - "akraino-project-stream-stage-docker" diff --git a/jjb/redfish/redfish.yaml b/jjb/redfish/redfish.yaml deleted file mode 100644 index 9e8e901..0000000 --- a/jjb/redfish/redfish.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - name: redfish - project-name: redfish - project: redfish - build-node: centos7-builder-2c-1g - stream: master - mvn-settings: redfish-settings - group-id: org.akraino.redfish - refspec: refs/heads/master - branch: master - jobs: - - akraino-project-stream-release-config - - akraino-project-stream-stage-config - views: - - project-view - cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/regional_controller/api-server-docker.yaml b/jjb/regional_controller/api-server-docker.yaml deleted file mode 100644 index 9e70f7a..0000000 --- a/jjb/regional_controller/api-server-docker.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# -# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - name: regional_controller-api-server-docker - project: "regional_controller/api-server" - project-name: regional_controller-api-server - global-settings-file: global-settings - build-node: ubuntu1804-docker-8c-8g - stream: master - java-version: openjdk8 - mvn-version: mvn35 - mvn-opts: "" - mvn-params: "" - mvn-settings: regional_controller-settings - build-timeout: 60 - submodule-recursive: true - branch: master - jobs: - - "akraino-project-stream-docker" - - "akraino-project-stream-stage-docker" diff --git a/jjb/regional_controller/api-server.yaml b/jjb/regional_controller/api-server.yaml deleted file mode 100644 index 0455b2d..0000000 --- a/jjb/regional_controller/api-server.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# -# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - name: regional_controller-api-server - project: "regional_controller/api-server" - project-name: regional_controller-api-server - mvn-settings: regional_controller-settings - mvn-params: "" - nexus-iq-namespace: "akraino-" - sonarcloud: true - sonarcloud-project-organization: "{sonarcloud_project_organization}" - sonarcloud-api-token: "{sonarcloud_api_token}" - sonarcloud-project-key: "{sonarcloud_project_organization}_regional_controller" - build-node: centos7-builder-2c-1g - stream: master - jobs: - - "{project-name}-maven-jobs" - - gerrit-maven-sonar - views: - - project-view diff --git a/jjb/regional_controller/info-regional_controller.yaml b/jjb/regional_controller/info-regional_controller.yaml deleted file mode 100644 index 5752ef2..0000000 --- a/jjb/regional_controller/info-regional_controller.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: regional_controller-info - project-name: regional_controller - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: regional_controller - branch: master diff --git a/jjb/regional_controller/regional_controller.yaml b/jjb/regional_controller/regional_controller.yaml deleted file mode 100644 index d7ab2dd..0000000 --- a/jjb/regional_controller/regional_controller.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - name: regional_controller - project-name: regional_controller - project: regional_controller - build-node: centos7-builder-2c-1g - stream: master - mvn-settings: regional_controller-settings - group-id: org.akraino.regional_controller - refspec: refs/heads/master - branch: master - jobs: - - akraino-project-stream-release-config - - akraino-project-stream-stage-config - views: - - project-view - cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/remote-server-os-bootstrap/info-remote-server-os-bootstrap.yaml b/jjb/remote-server-os-bootstrap/info-remote-server-os-bootstrap.yaml deleted file mode 100644 index 03b2903..0000000 --- a/jjb/remote-server-os-bootstrap/info-remote-server-os-bootstrap.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: remote-server-os-bootstrap-info - project-name: remote-server-os-bootstrap - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: remote-server-os-bootstrap - branch: master diff --git a/jjb/repo-beta/info-repo-beta.yaml b/jjb/repo-beta/info-repo-beta.yaml deleted file mode 100644 index d83f54f..0000000 --- a/jjb/repo-beta/info-repo-beta.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: repo-beta-info - project-name: repo-beta - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: repo-beta - branch: master diff --git a/jjb/sample_vnf/info-sample_vnf.yaml b/jjb/sample_vnf/info-sample_vnf.yaml deleted file mode 100644 index d9fb428..0000000 --- a/jjb/sample_vnf/info-sample_vnf.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: sample_vnf-info - project-name: sample_vnf - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: sample_vnf - branch: master diff --git a/jjb/sample_vnf/sample_vnf.yaml b/jjb/sample_vnf/sample_vnf.yaml deleted file mode 100644 index 40098de..0000000 --- a/jjb/sample_vnf/sample_vnf.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - name: sample_vnf - project-name: sample_vnf - project: sample_vnf - build-node: centos7-builder-2c-1g - stream: master - mvn-settings: sample_vnf-settings - group-id: org.akraino.sample_vnf - refspec: refs/heads/master - branch: master - jobs: - - akraino-project-stream-release-config - - akraino-project-stream-stage-config - views: - - project-view - cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/serverless/info-serverless.yaml b/jjb/serverless/info-serverless.yaml deleted file mode 100644 index 732d0b2..0000000 --- a/jjb/serverless/info-serverless.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: serverless-info - project-name: serverless - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: serverless - branch: master diff --git a/jjb/starlingx/info-starlingx.yaml b/jjb/starlingx/info-starlingx.yaml deleted file mode 100644 index 072d4ec..0000000 --- a/jjb/starlingx/info-starlingx.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: starlingx-info - project-name: starlingx - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: starlingx - branch: master diff --git a/jjb/starlingx/starlingx.yaml b/jjb/starlingx/starlingx.yaml deleted file mode 100644 index 5b55da7..0000000 --- a/jjb/starlingx/starlingx.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: starlingx-project-view - project-name: starlingx - project: starlingx - stream: - - master: - branch: master - build-node: centos7-dev-16c-48g - jobs: - - akraino-project-stream-verify - views: - - project-view - cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/ta/access-management.yaml b/jjb/ta/access-management.yaml deleted file mode 100644 index 7b098b5..0000000 --- a/jjb/ta/access-management.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-access-management-amd64 - project: ta/access-management - project-name: ta-access-management-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-access-management-arm64 - project: ta/access-management - project-name: ta-access-management-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/ansible-role-ntp.yaml b/jjb/ta/ansible-role-ntp.yaml deleted file mode 100644 index a4248af..0000000 --- a/jjb/ta/ansible-role-ntp.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-ansible-role-ntp-amd64 - project: ta/ansible-role-ntp - project-name: ta-ansible-role-ntp-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-ansible-role-ntp-arm64 - project: ta/ansible-role-ntp - project-name: ta-ansible-role-ntp-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-cpupooler.yaml b/jjb/ta/caas-cpupooler.yaml deleted file mode 100644 index bac8674..0000000 --- a/jjb/ta/caas-cpupooler.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-caas-cpupooler-amd64 - project: ta/caas-cpupooler - project-name: ta-caas-cpupooler-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-8g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-caas-cpupooler-arm64 - project: ta/caas-cpupooler - project-name: ta-caas-cpupooler-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-danm.yaml b/jjb/ta/caas-danm.yaml deleted file mode 100644 index 2f2b272..0000000 --- a/jjb/ta/caas-danm.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-caas-danm-amd64 - project: ta/caas-danm - project-name: ta-caas-danm-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-8g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-caas-danm-arm64 - project: ta/caas-danm - project-name: ta-caas-danm-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-etcd.yaml b/jjb/ta/caas-etcd.yaml deleted file mode 100644 index 8096b51..0000000 --- a/jjb/ta/caas-etcd.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-caas-etcd-amd64 - project: ta/caas-etcd - project-name: ta-caas-etcd-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-8g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-caas-etcd-arm64 - project: ta/caas-etcd - project-name: ta-caas-etcd-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-helm.yaml b/jjb/ta/caas-helm.yaml deleted file mode 100644 index 6ba9340..0000000 --- a/jjb/ta/caas-helm.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-caas-helm-amd64 - project: ta/caas-helm - project-name: ta-caas-helm-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-8c-8g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-caas-helm-arm64 - project: ta/caas-helm - project-name: ta-caas-helm-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-install.yaml b/jjb/ta/caas-install.yaml deleted file mode 100644 index aaeca72..0000000 --- a/jjb/ta/caas-install.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-caas-install-amd64 - project: ta/caas-install - project-name: ta-caas-install-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-caas-install-arm64 - project: ta/caas-install - project-name: ta-caas-install-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-kubedns.yaml b/jjb/ta/caas-kubedns.yaml deleted file mode 100644 index 8a276eb..0000000 --- a/jjb/ta/caas-kubedns.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-caas-kubedns-amd64 - project: ta/caas-kubedns - project-name: ta-caas-kubedns-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-8g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-caas-kubedns-arm64 - project: ta/caas-kubedns - project-name: ta-caas-kubedns-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-lcm.yaml b/jjb/ta/caas-lcm.yaml deleted file mode 100644 index a6727d9..0000000 --- a/jjb/ta/caas-lcm.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-caas-lcm-amd64 - project: ta/caas-lcm - project-name: ta-caas-lcm-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-caas-lcm-arm64 - project: ta/caas-lcm - project-name: ta-caas-lcm-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-logging.yaml b/jjb/ta/caas-logging.yaml deleted file mode 100644 index 21bdb43..0000000 --- a/jjb/ta/caas-logging.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-caas-logging-amd64 - project: ta/caas-logging - project-name: ta-caas-logging-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-caas-logging-arm64 - project: ta/caas-logging - project-name: ta-caas-logging-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-metrics.yaml b/jjb/ta/caas-metrics.yaml deleted file mode 100644 index adef144..0000000 --- a/jjb/ta/caas-metrics.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-caas-metrics-amd64 - project: ta/caas-metrics - project-name: ta-caas-metrics-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-8c-16g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-caas-metrics-arm64 - project: ta/caas-metrics - project-name: ta-caas-metrics-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-registry.yaml b/jjb/ta/caas-registry.yaml deleted file mode 100644 index fa23b0c..0000000 --- a/jjb/ta/caas-registry.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-caas-registry-amd64 - project: ta/caas-registry - project-name: ta-caas-registry-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-8g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-caas-registry-arm64 - project: ta/caas-registry - project-name: ta-caas-registry-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-security.yaml b/jjb/ta/caas-security.yaml deleted file mode 100644 index 4fc7bd7..0000000 --- a/jjb/ta/caas-security.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-caas-security-amd64 - project: ta/caas-security - project-name: ta-caas-security-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-caas-security-arm64 - project: ta/caas-security - project-name: ta-caas-security-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-storage.yaml b/jjb/ta/caas-storage.yaml deleted file mode 100644 index 76a1d56..0000000 --- a/jjb/ta/caas-storage.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-caas-storage-amd64 - project: ta/caas-storage - project-name: ta-caas-storage-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-8g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-caas-storage-arm64 - project: ta/caas-storage - project-name: ta-caas-storage-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/ci-build.yaml b/jjb/ta/ci-build.yaml deleted file mode 100644 index 88c8ee0..0000000 --- a/jjb/ta/ci-build.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- project: - name: ta-ci-build-amd64 - project: none - project-name: none - build-node: centos7-builder-8c-32g - stream: master - build-timeout: 120 - jobs: - - akraino-project-release-ta-build - -- project: - name: ta-ci-build-arm64 - project: none - project-name: none - build-node: aarch64_build - stream: master - build-timeout: 180 - jobs: - - akraino-project-release-ta-build diff --git a/jjb/ta/cloudtaf.yaml b/jjb/ta/cloudtaf.yaml deleted file mode 100644 index 5560aad..0000000 --- a/jjb/ta/cloudtaf.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -- project: - name: ta-cloudtaf-amd64 - project: ta/cloudtaf - project-name: ta-cloudtaf-amd64 - project-type: - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-cloudtaf-arm64 - project: ta/cloudtaf - project-name: ta-cloudtaf-arm64 - project-type: - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/cm-plugins.yaml b/jjb/ta/cm-plugins.yaml deleted file mode 100644 index 6c51dc5..0000000 --- a/jjb/ta/cm-plugins.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-cm-plugins-amd64 - project: ta/cm-plugins - project-name: ta-cm-plugins-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-cm-plugins-arm64 - project: ta/cm-plugins - project-name: ta-cm-plugins-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/config-manager.yaml b/jjb/ta/config-manager.yaml deleted file mode 100644 index ef31342..0000000 --- a/jjb/ta/config-manager.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-config-manager-amd64 - project: ta/config-manager - project-name: ta-config-manager-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-config-manager-arm64 - project: ta/config-manager - project-name: ta-config-manager-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/distributed-state-server.yaml b/jjb/ta/distributed-state-server.yaml deleted file mode 100644 index 553f26d..0000000 --- a/jjb/ta/distributed-state-server.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-distributed-state-server-amd64 - project: ta/distributed-state-server - project-name: ta-distributed-state-server-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-distributed-state-server-arm64 - project: ta/distributed-state-server - project-name: ta-distributed-state-server-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/hostcli.yaml b/jjb/ta/hostcli.yaml deleted file mode 100644 index 31fe926..0000000 --- a/jjb/ta/hostcli.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-hostcli-amd64 - project: ta/hostcli - project-name: ta-hostcli-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-hostcli-arm64 - project: ta/hostcli - project-name: ta-hostcli-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/hw-detector.yaml b/jjb/ta/hw-detector.yaml deleted file mode 100644 index ec64816..0000000 --- a/jjb/ta/hw-detector.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-hw-detector-amd64 - project: ta/hw-detector - project-name: ta-hw-detector-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-hw-detector-arm64 - project: ta/hw-detector - project-name: ta-hw-detector-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/image-provision.yaml b/jjb/ta/image-provision.yaml deleted file mode 100644 index fd71e8a..0000000 --- a/jjb/ta/image-provision.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-image-provision-amd64 - project: ta/image-provision - project-name: ta-image-provision-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-image-provision-arm64 - project: ta/image-provision - project-name: ta-image-provision-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/ipa-deployer.yaml b/jjb/ta/ipa-deployer.yaml deleted file mode 100644 index 807c8db..0000000 --- a/jjb/ta/ipa-deployer.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-ipa-deployer-amd64 - project: ta/ipa-deployer - project-name: ta-ipa-deployer-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-ipa-deployer-arm64 - project: ta/ipa-deployer - project-name: ta-ipa-deployer-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/ironic-virtmedia-driver.yaml b/jjb/ta/ironic-virtmedia-driver.yaml deleted file mode 100644 index d1bc586..0000000 --- a/jjb/ta/ironic-virtmedia-driver.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-ironic-virtmedia-driver-amd64 - project: ta/ironic-virtmedia-driver - project-name: ta-ironic-virtmedia-driver-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-ironic-virtmedia-driver-arm64 - project: ta/ironic-virtmedia-driver - project-name: ta-ironic-virtmedia-driver-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/ironic.yaml b/jjb/ta/ironic.yaml deleted file mode 100644 index 3626c30..0000000 --- a/jjb/ta/ironic.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-ironic-amd64 - project: ta/ironic - project-name: ta-ironic-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-8c-8g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-ironic-arm64 - project: ta/ironic - project-name: ta-ironic-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/ironicclient.yaml b/jjb/ta/ironicclient.yaml deleted file mode 100644 index 3d3a90e..0000000 --- a/jjb/ta/ironicclient.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-ironicclient-amd64 - project: ta/ironicclient - project-name: ta-ironicclient-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-ironicclient-arm64 - project: ta/ironicclient - project-name: ta-ironicclient-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/lockcli.yaml b/jjb/ta/lockcli.yaml deleted file mode 100644 index 582039c..0000000 --- a/jjb/ta/lockcli.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-lockcli-amd64 - project: ta/lockcli - project-name: ta-lockcli-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-lockcli-arm64 - project: ta/lockcli - project-name: ta-lockcli-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/monitoring.yaml b/jjb/ta/monitoring.yaml deleted file mode 100644 index 4c2eda0..0000000 --- a/jjb/ta/monitoring.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-monitoring-amd64 - project: ta/monitoring - project-name: ta-monitoring-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-monitoring-arm64 - project: ta/monitoring - project-name: ta-monitoring-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-galera_client.yaml b/jjb/ta/openstack-ansible-galera_client.yaml deleted file mode 100644 index 5ba51a9..0000000 --- a/jjb/ta/openstack-ansible-galera_client.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-openstack-ansible-galera_client-amd64 - project: ta/openstack-ansible-galera_client - project-name: ta-openstack-ansible-galera_client-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-openstack-ansible-galera_client-arm64 - project: ta/openstack-ansible-galera_client - project-name: ta-openstack-ansible-galera_client-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-galera_server.yaml b/jjb/ta/openstack-ansible-galera_server.yaml deleted file mode 100644 index ee4d97e..0000000 --- a/jjb/ta/openstack-ansible-galera_server.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-openstack-ansible-galera_server-amd64 - project: ta/openstack-ansible-galera_server - project-name: ta-openstack-ansible-galera_server-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-openstack-ansible-galera_server-arm64 - project: ta/openstack-ansible-galera_server - project-name: ta-openstack-ansible-galera_server-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-haproxy_server.yaml b/jjb/ta/openstack-ansible-haproxy_server.yaml deleted file mode 100644 index d0ce0ee..0000000 --- a/jjb/ta/openstack-ansible-haproxy_server.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-openstack-ansible-haproxy_server-amd64 - project: ta/openstack-ansible-haproxy_server - project-name: ta-openstack-ansible-haproxy_server-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-openstack-ansible-haproxy_server-arm64 - project: ta/openstack-ansible-haproxy_server - project-name: ta-openstack-ansible-haproxy_server-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-memcached_server.yaml b/jjb/ta/openstack-ansible-memcached_server.yaml deleted file mode 100644 index ccaa434..0000000 --- a/jjb/ta/openstack-ansible-memcached_server.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-openstack-ansible-memcached_server-amd64 - project: ta/openstack-ansible-memcached_server - project-name: ta-openstack-ansible-memcached_server-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-openstack-ansible-memcached_server-arm64 - project: ta/openstack-ansible-memcached_server - project-name: ta-openstack-ansible-memcached_server-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-openstack_openrc.yaml b/jjb/ta/openstack-ansible-openstack_openrc.yaml deleted file mode 100644 index f84035b..0000000 --- a/jjb/ta/openstack-ansible-openstack_openrc.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-openstack-ansible-openstack_openrc-amd64 - project: ta/openstack-ansible-openstack_openrc - project-name: ta-openstack-ansible-openstack_openrc-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-openstack-ansible-openstack_openrc-arm64 - project: ta/openstack-ansible-openstack_openrc - project-name: ta-openstack-ansible-openstack_openrc-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-os_ironic.yaml b/jjb/ta/openstack-ansible-os_ironic.yaml deleted file mode 100644 index 2cee824..0000000 --- a/jjb/ta/openstack-ansible-os_ironic.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-openstack-ansible-os_ironic-amd64 - project: ta/openstack-ansible-os_ironic - project-name: ta-openstack-ansible-os_ironic-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-openstack-ansible-os_ironic-arm64 - project: ta/openstack-ansible-os_ironic - project-name: ta-openstack-ansible-os_ironic-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-os_keystone.yaml b/jjb/ta/openstack-ansible-os_keystone.yaml deleted file mode 100644 index dc3c63e..0000000 --- a/jjb/ta/openstack-ansible-os_keystone.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-openstack-ansible-os_keystone-amd64 - project: ta/openstack-ansible-os_keystone - project-name: ta-openstack-ansible-os_keystone-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-openstack-ansible-os_keystone-arm64 - project: ta/openstack-ansible-os_keystone - project-name: ta-openstack-ansible-os_keystone-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-plugins.yaml b/jjb/ta/openstack-ansible-plugins.yaml deleted file mode 100644 index ee54e01..0000000 --- a/jjb/ta/openstack-ansible-plugins.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-openstack-ansible-plugins-amd64 - project: ta/openstack-ansible-plugins - project-name: ta-openstack-ansible-plugins-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-openstack-ansible-plugins-arm64 - project: ta/openstack-ansible-plugins - project-name: ta-openstack-ansible-plugins-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-rabbitmq_server.yaml b/jjb/ta/openstack-ansible-rabbitmq_server.yaml deleted file mode 100644 index df1df1c..0000000 --- a/jjb/ta/openstack-ansible-rabbitmq_server.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-openstack-ansible-rabbitmq_server-amd64 - project: ta/openstack-ansible-rabbitmq_server - project-name: ta-openstack-ansible-rabbitmq_server-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-openstack-ansible-rabbitmq_server-arm64 - project: ta/openstack-ansible-rabbitmq_server - project-name: ta-openstack-ansible-rabbitmq_server-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-rsyslog_client.yaml b/jjb/ta/openstack-ansible-rsyslog_client.yaml deleted file mode 100644 index 4724191..0000000 --- a/jjb/ta/openstack-ansible-rsyslog_client.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-openstack-ansible-rsyslog_client-amd64 - project: ta/openstack-ansible-rsyslog_client - project-name: ta-openstack-ansible-rsyslog_client-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-openstack-ansible-rsyslog_client-arm64 - project: ta/openstack-ansible-rsyslog_client - project-name: ta-openstack-ansible-rsyslog_client-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible.yaml b/jjb/ta/openstack-ansible.yaml deleted file mode 100644 index 945a2b9..0000000 --- a/jjb/ta/openstack-ansible.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-openstack-ansible-amd64 - project: ta/openstack-ansible - project-name: ta-openstack-ansible-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-openstack-ansible-arm64 - project: ta/openstack-ansible - project-name: ta-openstack-ansible-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/os-net-config.yaml b/jjb/ta/os-net-config.yaml deleted file mode 100644 index b4afc14..0000000 --- a/jjb/ta/os-net-config.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-os-net-config-amd64 - project: ta/os-net-config - project-name: ta-os-net-config-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-os-net-config-arm64 - project: ta/os-net-config - project-name: ta-os-net-config-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/python-ilorest-library.yaml b/jjb/ta/python-ilorest-library.yaml deleted file mode 100644 index 1ecc6f4..0000000 --- a/jjb/ta/python-ilorest-library.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-python-ilorest-library-amd64 - project: ta/python-ilorest-library - project-name: ta-python-ilorest-library-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-python-ilorest-library-arm64 - project: ta/python-ilorest-library - project-name: ta-python-ilorest-library-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/python-peewee.yaml b/jjb/ta/python-peewee.yaml deleted file mode 100644 index d6e4774..0000000 --- a/jjb/ta/python-peewee.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-python-peewee-amd64 - project: ta/python-peewee - project-name: ta-python-peewee-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-python-peewee-arm64 - project: ta/python-peewee - project-name: ta-python-peewee-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/remote-installer.yaml b/jjb/ta/remote-installer.yaml deleted file mode 100644 index 828d0ed..0000000 --- a/jjb/ta/remote-installer.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- project: - name: ta-remote-installer - project: ta/remote-installer - project-name: ta-remote-installer - global-settings-file: global-settings - build-node: ubuntu1804-docker-8c-8g - stream: master - java-version: openjdk8 - mvn-version: mvn35 - mvn-opts: "" - mvn-params: "" - mvn-settings: ta-settings - build-timeout: 60 - branch: master - submodule-recursive: true - jobs: - - "akraino-project-stream-docker" - - "akraino-project-stream-stage-docker" diff --git a/jjb/ta/rpmbuilder.yaml b/jjb/ta/rpmbuilder.yaml deleted file mode 100644 index 968e467..0000000 --- a/jjb/ta/rpmbuilder.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- project: - name: ta-rpmbuilder-amd64 - project: ta/rpmbuilder - project-name: ta-rpmbuilder-amd64 - project-type: - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta-rpmbuilder - -- project: - name: ta-rpmbuilder-arm64 - project: ta/rpmbuilder - project-name: ta-rpmbuilder-arm64 - project-type: - - verify - build-node: aarch64_build - stream: master - jobs: - - akraino-project-stream-type-ta-rpmbuilder diff --git a/jjb/ta/start-menu.yaml b/jjb/ta/start-menu.yaml deleted file mode 100644 index a3bce61..0000000 --- a/jjb/ta/start-menu.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-start-menu-amd64 - project: ta/start-menu - project-name: ta-start-menu-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-start-menu-arm64 - project: ta/start-menu - project-name: ta-start-menu-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/storage.yaml b/jjb/ta/storage.yaml deleted file mode 100644 index ce0ffcf..0000000 --- a/jjb/ta/storage.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-storage-amd64 - project: ta/storage - project-name: ta-storage-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-storage-arm64 - project: ta/storage - project-name: ta-storage-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/ta/yarf.yaml b/jjb/ta/yarf.yaml deleted file mode 100644 index ee68f87..0000000 --- a/jjb/ta/yarf.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ta-yarf-amd64 - project: ta/yarf - project-name: ta-yarf-amd64 - project-type: - - merge - - verify - build-node: centos7-builder-2c-1g - stream: master - jobs: - - akraino-project-stream-type-ta - -- project: - name: ta-yarf-arm64 - project: ta/yarf - project-name: ta-yarf-arm64 - project-type: - - merge - - verify - build-node: aarch64_build - arch: arm64 - stream: master - jobs: - - akraino-project-stream-type-ta diff --git a/jjb/tami/tami.yaml b/jjb/tami/tami.yaml deleted file mode 100644 index cf8499d..0000000 --- a/jjb/tami/tami.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: tami-project-view - project-name: tami - views: - - project-view - -- project: - name: tami-info - project: tami - project-name: tami - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify diff --git a/jjb/tc/info-tc.yaml b/jjb/tc/info-tc.yaml deleted file mode 100644 index 7e07c4b..0000000 --- a/jjb/tc/info-tc.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: tc-info - project-name: tc - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: tc - branch: master diff --git a/jjb/tc/tc.yaml b/jjb/tc/tc.yaml deleted file mode 100644 index 355731c..0000000 --- a/jjb/tc/tc.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- project: - name: tc-project-view - project-name: tc - views: - - project-view diff --git a/jjb/test_automation/info-test_automation.yaml b/jjb/test_automation/info-test_automation.yaml deleted file mode 100644 index bc8b29b..0000000 --- a/jjb/test_automation/info-test_automation.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: test_automation-info - project-name: test_automation - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: test_automation - branch: master diff --git a/jjb/test_automation/test_automation.yaml b/jjb/test_automation/test_automation.yaml deleted file mode 100644 index 1371d0a..0000000 --- a/jjb/test_automation/test_automation.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - name: test_automation - project-name: test_automation - project: test_automation - build-node: centos7-builder-2c-1g - stream: master - mvn-settings: test_automation-settings - group-id: org.akraino.test_automation - refspec: refs/heads/master - branch: master - jobs: - - akraino-project-stream-release-config - - akraino-project-stream-stage-config - views: - - project-view - cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/umec/info-umec.yaml b/jjb/umec/info-umec.yaml deleted file mode 100644 index 190bdee..0000000 --- a/jjb/umec/info-umec.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: umec-info - project-name: umec - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: umec - branch: master diff --git a/jjb/umec/umec.yaml b/jjb/umec/umec.yaml deleted file mode 100644 index af3d21c..0000000 --- a/jjb/umec/umec.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- project: - name: umec-project-view - project-name: umec - views: - - project-view diff --git a/jjb/yaml_builds/info-yaml_builds.yaml b/jjb/yaml_builds/info-yaml_builds.yaml deleted file mode 100644 index 0f106b9..0000000 --- a/jjb/yaml_builds/info-yaml_builds.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: yaml_builds-info - project-name: yaml_builds - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: yaml_builds - branch: master diff --git a/jjb/yaml_builds/yaml_builds.yaml b/jjb/yaml_builds/yaml_builds.yaml deleted file mode 100644 index 4bcd725..0000000 --- a/jjb/yaml_builds/yaml_builds.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -- project: - name: yaml_builds - project-name: yaml_builds - project: yaml_builds - build-node: centos7-builder-2c-1g - stream: master - mvn-settings: yaml_builds-settings - group-id: org.akraino.yaml_builds - refspec: refs/heads/master - branch: master - jobs: - - akraino-project-stream-release-config - - akraino-project-stream-stage-config - views: - - project-view - cron: "@weekly" # push fresh snapshot weekly -- 2.16.6 From a09bb2c8b843a360530d27eb4e763aee33e35306 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Mon, 11 Dec 2023 18:01:03 -0800 Subject: [PATCH 12/16] Fix: Add concurrency and permissions to verify Though concurrency is also defined in the composed workflow, this action needs it as well. The permissions are also important to allow to nested actions to execute properly. Change-Id: I340202d53dac355a2f357535af058edd8223e175 Signed-off-by: Eric Ball --- .github/workflows/gerrit-verify.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml index cd06381..978e92e 100644 --- a/.github/workflows/gerrit-verify.yaml +++ b/.github/workflows/gerrit-verify.yaml @@ -48,6 +48,13 @@ on: default: "{}" type: string +concurrency: + # yamllint disable-line rule:line-length + group: ci-management-${{ github.workflow }}-${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }} + cancel-in-progress: true + +permissions: read-all + jobs: call-composed-ci-man-verify: # yamllint disable-line rule:line-length -- 2.16.6 From e9e26c5c06c282f338dfda5aea11eb0f4b5ec7fc Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Tue, 12 Dec 2023 17:17:32 -0800 Subject: [PATCH 13/16] Chore: Remove all JJB info jobs INFO.yaml files are now being validated via GHA. All JJB INFO jobs can be removed, and for those projects where the only job was INFO, the directory can be removed as well. Change-Id: Id051a730553ba95ac5eca02e249ef373a0634862 Issue-ID: LF-Jira RELENG-4799 Signed-off-by: Eric Ball --- jjb/aiedge/info-aiedge.yaml | 9 --------- jjb/cassini/cassini.yaml | 14 -------------- jjb/eliot/info-eliot.yaml | 9 --------- jjb/icn/info-icn.yaml | 9 --------- jjb/iec/info-iec.yaml | 9 --------- jjb/kni/info-kni.yaml | 9 --------- jjb/pcei/pcei.yaml | 14 -------------- jjb/pred-vanet-mec/pred-vanet-mec.yaml | 14 -------------- jjb/robot/robot.yaml | 14 -------------- jjb/sdt/sdt.yaml | 14 -------------- jjb/security/security.yaml | 14 -------------- jjb/security_tools/security_tools.yaml | 14 -------------- jjb/ta/info-ta.yaml | 9 --------- jjb/validation/info-validation.yaml | 9 --------- 14 files changed, 161 deletions(-) delete mode 100644 jjb/aiedge/info-aiedge.yaml delete mode 100644 jjb/cassini/cassini.yaml delete mode 100644 jjb/eliot/info-eliot.yaml delete mode 100644 jjb/icn/info-icn.yaml delete mode 100644 jjb/iec/info-iec.yaml delete mode 100644 jjb/kni/info-kni.yaml delete mode 100644 jjb/pcei/pcei.yaml delete mode 100644 jjb/pred-vanet-mec/pred-vanet-mec.yaml delete mode 100644 jjb/robot/robot.yaml delete mode 100644 jjb/sdt/sdt.yaml delete mode 100644 jjb/security/security.yaml delete mode 100644 jjb/security_tools/security_tools.yaml delete mode 100644 jjb/ta/info-ta.yaml delete mode 100644 jjb/validation/info-validation.yaml diff --git a/jjb/aiedge/info-aiedge.yaml b/jjb/aiedge/info-aiedge.yaml deleted file mode 100644 index 6761cc1..0000000 --- a/jjb/aiedge/info-aiedge.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: aiedge-info - project-name: aiedge - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: aiedge - branch: master diff --git a/jjb/cassini/cassini.yaml b/jjb/cassini/cassini.yaml deleted file mode 100644 index 72f59b4..0000000 --- a/jjb/cassini/cassini.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: cassini-project-view - project-name: cassini - views: - - project-view - -- project: - name: cassini-info - project: cassini - project-name: cassini - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify diff --git a/jjb/eliot/info-eliot.yaml b/jjb/eliot/info-eliot.yaml deleted file mode 100644 index 2ac98c3..0000000 --- a/jjb/eliot/info-eliot.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: eliot-info - project-name: eliot - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: eliot - branch: master diff --git a/jjb/icn/info-icn.yaml b/jjb/icn/info-icn.yaml deleted file mode 100644 index 8a81a52..0000000 --- a/jjb/icn/info-icn.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: icn-info - project-name: icn - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: icn - branch: master diff --git a/jjb/iec/info-iec.yaml b/jjb/iec/info-iec.yaml deleted file mode 100644 index 9046591..0000000 --- a/jjb/iec/info-iec.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: iec-info - project-name: iec - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: iec - branch: master diff --git a/jjb/kni/info-kni.yaml b/jjb/kni/info-kni.yaml deleted file mode 100644 index f5192ec..0000000 --- a/jjb/kni/info-kni.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: kni-info - project-name: kni - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: kni - branch: master diff --git a/jjb/pcei/pcei.yaml b/jjb/pcei/pcei.yaml deleted file mode 100644 index 2ac4138..0000000 --- a/jjb/pcei/pcei.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: pcei-project-view - project-name: pcei - views: - - project-view - -- project: - name: pcei-info - project: pcei - project-name: pcei - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify diff --git a/jjb/pred-vanet-mec/pred-vanet-mec.yaml b/jjb/pred-vanet-mec/pred-vanet-mec.yaml deleted file mode 100644 index 0cfb46a..0000000 --- a/jjb/pred-vanet-mec/pred-vanet-mec.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: pred-vanet-mec-project-view - project-name: pred-vanet-mec - views: - - project-view - -- project: - name: pred-vanet-mec-info - project: pred-vanet-mec - project-name: pred-vanet-mec - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify diff --git a/jjb/robot/robot.yaml b/jjb/robot/robot.yaml deleted file mode 100644 index cc43e3b..0000000 --- a/jjb/robot/robot.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: robot-project-view - project-name: robot - views: - - project-view - -- project: - name: robot-info - project: robot - project-name: robot - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify diff --git a/jjb/sdt/sdt.yaml b/jjb/sdt/sdt.yaml deleted file mode 100644 index 0f36325..0000000 --- a/jjb/sdt/sdt.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: sdt-project-view - project-name: sdt - views: - - project-view - -- project: - name: sdt-info - project: sdt - project-name: sdt - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify diff --git a/jjb/security/security.yaml b/jjb/security/security.yaml deleted file mode 100644 index 73cbd1e..0000000 --- a/jjb/security/security.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: security-project-view - project-name: security - views: - - project-view - -- project: - name: security-info - project: security - project-name: security - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify diff --git a/jjb/security_tools/security_tools.yaml b/jjb/security_tools/security_tools.yaml deleted file mode 100644 index b3d463e..0000000 --- a/jjb/security_tools/security_tools.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: security_tools-project-view - project-name: security_tools - views: - - project-view - -- project: - name: security_tools-info - project: security_tools - project-name: security_tools - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify diff --git a/jjb/ta/info-ta.yaml b/jjb/ta/info-ta.yaml deleted file mode 100644 index b72d743..0000000 --- a/jjb/ta/info-ta.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: ta-info - project-name: ta - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: ta - branch: master diff --git a/jjb/validation/info-validation.yaml b/jjb/validation/info-validation.yaml deleted file mode 100644 index 132229d..0000000 --- a/jjb/validation/info-validation.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: validation-info - project-name: validation - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - project: validation - branch: master -- 2.16.6 From b2b26d4b275f686897b9cc88649cd4f68370ea6a Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Fri, 19 Jan 2024 14:14:34 -0800 Subject: [PATCH 14/16] CI: Rename global-settings to mvn-global-settings This is the name that is expected by maven jobs. Change-Id: I1ae199a23f32c4a8c0196346f9810fd164b8d126 Signed-off-by: Eric Ball --- .../{global-settings => mvn-global-settings}/config-params.yaml | 2 +- .../{global-settings => mvn-global-settings}/content | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename jenkins-config/managed-config-files/globalMavenSettings/{global-settings => mvn-global-settings}/config-params.yaml (60%) rename jenkins-config/managed-config-files/globalMavenSettings/{global-settings => mvn-global-settings}/content (100%) diff --git a/jenkins-config/managed-config-files/globalMavenSettings/global-settings/config-params.yaml b/jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/config-params.yaml similarity index 60% rename from jenkins-config/managed-config-files/globalMavenSettings/global-settings/config-params.yaml rename to jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/config-params.yaml index cf85503..20690cb 100644 --- a/jenkins-config/managed-config-files/globalMavenSettings/global-settings/config-params.yaml +++ b/jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/config-params.yaml @@ -1,3 +1,3 @@ --- -name: "global-settings" +name: "mvn-global-settings" comment: "Maven Global Settings file" diff --git a/jenkins-config/managed-config-files/globalMavenSettings/global-settings/content b/jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/content similarity index 100% rename from jenkins-config/managed-config-files/globalMavenSettings/global-settings/content rename to jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/content -- 2.16.6 From 557258996f2edb1c30b01b932ae2f3052de7de20 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Mon, 5 Feb 2024 15:07:53 -0800 Subject: [PATCH 15/16] Chore: Upgrade global-jjb to v0.90.0 For compatibility with JJB v6, some additional files needed to be escaped when read, and some inline scripts were moved to separate files. Change-Id: I6734e386e7256cc4d4bffd15cf4d390703eefe4b Signed-off-by: Eric Ball --- global-jjb | 2 +- jjb/akraino-templates/akraino-jjb-kni.yaml | 4 +- jjb/akraino-templates/akraino-jjb-templates.yaml | 5 ++- .../akraino-ta-common-macros.yaml | 48 ++++------------------ jjb/shell/ta-install-build-tools.sh | 11 +++++ jjb/shell/ta-install-docker.sh | 21 ++++++++++ 6 files changed, 47 insertions(+), 44 deletions(-) create mode 100644 jjb/shell/ta-install-build-tools.sh create mode 100644 jjb/shell/ta-install-docker.sh diff --git a/global-jjb b/global-jjb index d31ff46..5d33657 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit d31ff4635d1dc4a6afe4cf3be622a219be5f1318 +Subproject commit 5d336574e77fb349ace15356ef8ffb816d463544 diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml index 2e396bc..91e1a54 100644 --- a/jjb/akraino-templates/akraino-jjb-kni.yaml +++ b/jjb/akraino-templates/akraino-jjb-kni.yaml @@ -29,9 +29,9 @@ variable: "SETTINGS_FILE" - lf-infra-create-netrc: server-id: logs - - shell: !include-raw: + - shell: !include-raw-escape: - ../../global-jjb/shell/logs-deploy.sh - - shell: !include-raw: + - shell: !include-raw-escape: - ../../global-jjb/shell/logs-clear-credentials.sh - description-setter: regexp: "(^(Nexus|S3) build logs: .*)" diff --git a/jjb/akraino-templates/akraino-jjb-templates.yaml b/jjb/akraino-templates/akraino-jjb-templates.yaml index 4975463..b0c4d3e 100644 --- a/jjb/akraino-templates/akraino-jjb-templates.yaml +++ b/jjb/akraino-templates/akraino-jjb-templates.yaml @@ -258,7 +258,10 @@ sign-artifacts: "{sign-artifacts}" sign-dir: "$WORKSPACE/m2repo" sign-mode: serial - - lf-maven-stage + - lf-maven-stage: + mvn-global-settings: "global-settings" + mvn-settings: "" + mvn-staging-id: "" - lf-provide-maven-settings-cleanup publishers: diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml index ca444f8..9ead2c4 100644 --- a/jjb/akraino-templates/akraino-ta-common-macros.yaml +++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml @@ -178,13 +178,13 @@ properties-content: | ALT_NEXUS_URL= SERVER_ID= - - shell: !include-raw: + - shell: !include-raw-escape: # Ensure python-tools are installed in case job template does not # call the lf-infra-pre-build macro. - ../../global-jjb/shell/python-tools-install.sh - - shell: !include-raw: + - shell: !include-raw-escape: - ../shell/ta-rpm-deploy.sh - - shell: !include-raw: + - shell: !include-raw-escape: - ../../global-jjb/shell/logs-clear-credentials.sh - builder: @@ -198,13 +198,13 @@ variable: "SETTINGS_FILE" - lf-infra-create-netrc: server-id: images-snapshots - - shell: !include-raw: + - shell: !include-raw-escape: # Ensure python-tools are installed in case job template does not # call the lf-infra-pre-build macro. - ../../global-jjb/shell/python-tools-install.sh - - shell: !include-raw: + - shell: !include-raw-escape: - ../shell/ta-iso-deploy.sh - - shell: !include-raw: + - shell: !include-raw-escape: - ../../global-jjb/shell/logs-clear-credentials.sh - builder: @@ -268,44 +268,12 @@ - builder: name: ta-builder-install-docker builders: - - shell: |2- - #!/bin/bash -ex - if apt --version 2>1 >/dev/null; then - sudo chmod +r /boot/vmlinuz* - if ! docker --version 2>1 >/dev/null; then - sudo apt update - sudo apt install -y apt-transport-https ca-certificates curl software-properties-common rename - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo add-apt-repository -y "deb http://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt update - sudo apt install -y docker-ce - fi - else - sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo - sudo yum -y install docker-ce docker-ce-cli containerd.io - fi - sudo mkdir -p /etc/docker/ - echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json - sudo systemctl start docker - # Ugly hack to make docker usable for non-root - # (adding to the group would require re-login) - sudo chmod 777 /var/run/docker.sock + - shell: !include-raw-escape: ../shell/ta-install-docker.sh - builder: name: ta-builder-install-build-tools builders: - - shell: |2- - #!/bin/bash -ex - if apt --version 2>1 >/dev/null; then - if ! createrepo --version 2>1 >/dev/null; then - sudo apt update - sudo apt install -y createrepo libguestfs-tools jq libvirt-daemon-system - fi - else - sudo yum -y install createrepo libguestfs-tools-c jq - fi - sudo systemctl start libvirtd - systemctl status libvirtd + - shell: !include-raw-escape: ../shell/ta-install-build-tools.sh ########### # TRIGGER # diff --git a/jjb/shell/ta-install-build-tools.sh b/jjb/shell/ta-install-build-tools.sh new file mode 100644 index 0000000..80500c3 --- /dev/null +++ b/jjb/shell/ta-install-build-tools.sh @@ -0,0 +1,11 @@ +#!/bin/bash -ex +if apt --version 2>1 >/dev/null; then + if ! createrepo --version 2>1 >/dev/null; then + sudo apt update + sudo apt install -y createrepo libguestfs-tools jq libvirt-daemon-system + fi +else + sudo yum -y install createrepo libguestfs-tools-c jq +fi +sudo systemctl start libvirtd +systemctl status libvirtd diff --git a/jjb/shell/ta-install-docker.sh b/jjb/shell/ta-install-docker.sh new file mode 100644 index 0000000..c75536e --- /dev/null +++ b/jjb/shell/ta-install-docker.sh @@ -0,0 +1,21 @@ +#!/bin/bash -ex +if apt --version 2>1 >/dev/null; then + sudo chmod +r /boot/vmlinuz* + if ! docker --version 2>1 >/dev/null; then + sudo apt update + sudo apt install -y apt-transport-https ca-certificates curl software-properties-common rename + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + sudo add-apt-repository -y "deb http://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + sudo apt update + sudo apt install -y docker-ce + fi +else + sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo + sudo yum -y install docker-ce docker-ce-cli containerd.io +fi +sudo mkdir -p /etc/docker/ +echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json +sudo systemctl start docker +# Ugly hack to make docker usable for non-root +# (adding to the group would require re-login) +sudo chmod 777 /var/run/docker.sock -- 2.16.6 From c58cdf2cb0fbe19f0877748a29388d393f2d6b67 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Thu, 1 Feb 2024 13:50:43 -0800 Subject: [PATCH 16/16] Revert "CI: Rename global-settings to mvn-glob..." This reverts commit b2b26d4b275f686897b9cc88649cd4f68370ea6a. Though some jobs have mvn-global-settings listed as the global settings file, renaming to "global-settings" is a standard that will carry forward to all projects for Github Actions. Since we are currently transitioning to GHA, this shouldn't be renamed. If JJB jobs still need to use this file, they should be modified to use "global-settings." Change-Id: Ib1190de829939d11b022361ebf72868e7152c3cc Issue-ID: LF-Jira RELENG-4799 Signed-off-by: Eric Ball --- .../{mvn-global-settings => global-settings}/config-params.yaml | 2 +- .../{mvn-global-settings => global-settings}/content | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename jenkins-config/managed-config-files/globalMavenSettings/{mvn-global-settings => global-settings}/config-params.yaml (60%) rename jenkins-config/managed-config-files/globalMavenSettings/{mvn-global-settings => global-settings}/content (100%) diff --git a/jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/config-params.yaml b/jenkins-config/managed-config-files/globalMavenSettings/global-settings/config-params.yaml similarity index 60% rename from jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/config-params.yaml rename to jenkins-config/managed-config-files/globalMavenSettings/global-settings/config-params.yaml index 20690cb..cf85503 100644 --- a/jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/config-params.yaml +++ b/jenkins-config/managed-config-files/globalMavenSettings/global-settings/config-params.yaml @@ -1,3 +1,3 @@ --- -name: "mvn-global-settings" +name: "global-settings" comment: "Maven Global Settings file" diff --git a/jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/content b/jenkins-config/managed-config-files/globalMavenSettings/global-settings/content similarity index 100% rename from jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/content rename to jenkins-config/managed-config-files/globalMavenSettings/global-settings/content -- 2.16.6