Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Chore: Turn on SBOM for MUSIC"
[ci-management.git]
/
jjb
/
multicloud
/
multicloud-openstack.yaml
diff --git
a/jjb/multicloud/multicloud-openstack.yaml
b/jjb/multicloud/multicloud-openstack.yaml
index
60060fd
..
4d83ed2
100644
(file)
--- a/
jjb/multicloud/multicloud-openstack.yaml
+++ b/
jjb/multicloud/multicloud-openstack.yaml
@@
-12,8
+12,6
@@
stream:
- 'master':
branch: 'master'
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'multicloud-openstack-settings'
subproject:
- 'pike':
mvn-settings: 'multicloud-openstack-settings'
subproject:
- 'pike':
@@
-62,10
+60,10
@@
- '{project-name}-{stream}-{subproject}-merge-java'
- gerrit-maven-stage:
sign-artifacts: true
- '{project-name}-{stream}-{subproject}-merge-java'
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos
7-build
er-4c-4g
+ build-node: centos
8-dock
er-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: centos
7
-docker-8c-8g
+ build-node: centos
8
-docker-8c-8g
maven-goals: install
mvn-params: '-P docker'
maven-versions-plugin: true
maven-goals: install
mvn-params: '-P docker'
maven-versions-plugin: true
@@
-75,7
+73,7
@@
build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
- build-node: 'centos
7
-builder-4c-4g'
+ build-node: 'centos
8
-builder-4c-4g'
#- project:
# name: multicloud-openstack-arm64
#- project:
# name: multicloud-openstack-arm64
@@
-102,11
+100,10
@@
- gerrit-maven-sonar
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
- gerrit-maven-sonar
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu
20
04-builder-4c-4g
+ build-node: ubuntu
18
04-builder-4c-4g
project: 'multicloud/openstack'
project-name: 'multicloud-openstack-windriver'
branch: 'master'
project: 'multicloud/openstack'
project-name: 'multicloud-openstack-windriver'
branch: 'master'
@@
-121,11
+118,10
@@
- gerrit-maven-sonar
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
- gerrit-maven-sonar
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu
20
04-builder-4c-4g
+ build-node: ubuntu
18
04-builder-4c-4g
project: 'multicloud/openstack'
project-name: 'multicloud-openstack-pike'
branch: 'master'
project: 'multicloud/openstack'
project-name: 'multicloud-openstack-pike'
branch: 'master'
@@
-140,11
+136,10
@@
- gerrit-maven-sonar
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
- gerrit-maven-sonar
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu
20
04-builder-4c-4g
+ build-node: ubuntu
18
04-builder-4c-4g
project: 'multicloud/openstack'
project-name: 'multicloud-openstack-starlingx'
branch: 'master'
project: 'multicloud/openstack'
project-name: 'multicloud-openstack-starlingx'
branch: 'master'
@@
-164,8
+159,6
@@
stream:
- 'master':
branch: 'master'
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'multicloud-openstack-settings'
- project:
mvn-settings: 'multicloud-openstack-settings'
- project:
@@
-174,11
+167,10
@@
- gerrit-maven-sonar
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
- gerrit-maven-sonar
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu
20
04-builder-4c-4g
+ build-node: ubuntu
18
04-builder-4c-4g
project: 'multicloud/openstack'
project-name: 'multicloud-openstack-fcaps'
branch: 'master'
project: 'multicloud/openstack'
project-name: 'multicloud-openstack-fcaps'
branch: 'master'
@@
-193,11
+185,10
@@
# - gerrit-maven-sonar
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
# - gerrit-maven-sonar
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
# cron: '@daily'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
# cron: '@daily'
-# build-node: ubuntu
20
04-builder-4c-4g
+# build-node: ubuntu
18
04-builder-4c-4g
# project: 'multicloud/openstack'
# project-name: 'multicloud-openstack-lenovo'
# branch: 'master'
# project: 'multicloud/openstack'
# project-name: 'multicloud-openstack-lenovo'
# branch: 'master'
@@
-212,11
+203,10
@@
- gerrit-maven-sonar
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
- gerrit-maven-sonar
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu
20
04-builder-4c-4g
+ build-node: ubuntu
18
04-builder-4c-4g
project: 'multicloud/openstack'
project-name: 'multicloud-openstack-hpa'
branch: 'master'
project: 'multicloud/openstack'
project-name: 'multicloud-openstack-hpa'
branch: 'master'
@@
-230,6
+220,6
@@
project-name: multicloud-openstack
jobs:
- gerrit-info-yaml-verify
project-name: multicloud-openstack
jobs:
- gerrit-info-yaml-verify
- build-node: centos
7
-builder-2c-1g
+ build-node: centos
8
-builder-2c-1g
project: multicloud/openstack
branch: master
project: multicloud/openstack
branch: master