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 "O-RAN-SC NONRTRIC Add jobs of ACM participants"
[ci-management.git]
/
jjb
/
ci-management
/
ci-docker.yaml
diff --git
a/jjb/ci-management/ci-docker.yaml
b/jjb/ci-management/ci-docker.yaml
index
1c2274d
..
ef5d7d3
100644
(file)
--- a/
jjb/ci-management/ci-docker.yaml
+++ b/
jjb/ci-management/ci-docker.yaml
@@
-2,32
+2,32
@@
# Job configurations for base docker build images
# This macro factors out common configuration
# Job configurations for base docker build images
# This macro factors out common configuration
-- ci_docker_common: &ci_docker_common
+-
_
ci_docker_common: &ci_docker_common
name: ci-docker-common
# git repo
project: ci-management
# maven settings file has docker credentials
mvn-settings: ci-management-settings
# build every Saturday
name: ci-docker-common
# git repo
project: ci-management
# maven settings file has docker credentials
mvn-settings: ci-management-settings
# build every Saturday
- cron:
'H H * * 6'
+ cron:
"H H * * 6"
# use host network to clone from our gerrit
# use host network to clone from our gerrit
- docker-build-args:
'--network=host'
+ docker-build-args:
"--network=host"
# get tag from YAML
container-tag-method: yaml-file
# name key is overridden by project template
# Jenkins job prefix
# get tag from YAML
container-tag-method: yaml-file
# name key is overridden by project template
# Jenkins job prefix
- project-name:
'{project}-{name}'
+ project-name:
"{project}-{name}"
# Docker image name
# Docker image name
- docker-name:
'{name}'
+ docker-name:
"{name}"
# Directory with Dockerfile
# Directory with Dockerfile
- docker-root:
'docker/{name}'
+ docker-root:
"docker/{name}"
# Limit build trigger to appropriate files
gerrit_trigger_file_paths:
- compare-type: REG_EXP
# Limit build trigger to appropriate files
gerrit_trigger_file_paths:
- compare-type: REG_EXP
- pattern:
'docker/{name}/.*'
+ pattern:
"docker/{name}/.*"
# Includes verify and merge jobs
jobs:
# Includes verify and merge jobs
jobs:
- -
'{project-name}-gerrit-docker-jobs'
+ -
"{project-name}-gerrit-docker-jobs"
# Only build master branch
stream:
- master:
# Only build master branch
stream:
- master:
@@
-36,18
+36,8
@@
# Each project name is a subdirectory in ci-management/docker
# with a Dockerfile and a container-tag.yaml file
# Each project name is a subdirectory in ci-management/docker
# with a Dockerfile and a container-tag.yaml file
-- project:
- name: bldr-alpine3
- <<: *ci_docker_common
-
-- project:
- name: bldr-alpine3-go
- <<: *ci_docker_common
-
+# This image is deprecated, projects should move to Ubuntu 18
+# TODO remove entirely
- project:
name: bldr-ubuntu16-c-go
<<: *ci_docker_common
- project:
name: bldr-ubuntu16-c-go
<<: *ci_docker_common
-
-- project:
- name: bldr-ubuntu18-c-go
- <<: *ci_docker_common