From fa2ec188f24f35d232cecf0cc91913904253e898 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Thu, 4 May 2023 10:56:08 -0700 Subject: [PATCH] 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