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
Restore jobs nonrtric-o-ru-closed-loop-recovery
[ci-management.git]
/
jjb
/
it-dev
/
it-dev-docker.yaml
diff --git
a/jjb/it-dev/it-dev-docker.yaml
b/jjb/it-dev/it-dev-docker.yaml
index
950bb74
..
a2311d9
100644
(file)
--- a/
jjb/it-dev/it-dev-docker.yaml
+++ b/
jjb/it-dev/it-dev-docker.yaml
@@
-15,15
+15,15
@@
# get tag from YAML
container-tag-method: yaml-file
# Jenkins job prefix
# get tag from YAML
container-tag-method: yaml-file
# Jenkins job prefix
- project-name: 'it-dev-{
img
}'
+ project-name: 'it-dev-{
name
}'
# Docker image name
# Docker image name
- docker-name: '
{img
}'
+ docker-name: '
o-ran-sc/{name
}'
# Directory with Dockerfile
# Directory with Dockerfile
- docker-root: '
docker/{img
}'
+ docker-root: '
bldr-imgs/{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: 'bldr-imgs/{
img
}/.*'
+ pattern: 'bldr-imgs/{
name
}/.*'
# Includes verify and merge jobs
jobs:
- '{project-name}-gerrit-docker-jobs'
# Includes verify and merge jobs
jobs:
- '{project-name}-gerrit-docker-jobs'
@@
-32,21
+32,25
@@
- master:
branch: master
- master:
branch: master
-# Each project name is a
subdirectory in bldr-image
s
+# Each project name is a
directory in o-ran-sc/it-dev/bldr-img
s
# with a Dockerfile and a container-tag.yaml file
# with a Dockerfile and a container-tag.yaml file
-# TODO: coalesce name+img after removing projects from ci-management
- project:
- project:
- name: it-dev-alpine3
- img: bldr-alpine3
+ name: bldr-alpine3
<<: *it_dev_docker_common
- project:
<<: *it_dev_docker_common
- project:
- name: it-dev-alpine3-go
- img: bldr-alpine3-go
+ name: bldr-alpine3-go
<<: *it_dev_docker_common
- project:
<<: *it_dev_docker_common
- project:
- name: it-dev-ubuntu18-c-go
- img: bldr-ubuntu18-c-go
+ name: bldr-alpine3-mdclog
+ <<: *it_dev_docker_common
+
+- project:
+ name: bldr-alpine3-rmr
+ <<: *it_dev_docker_common
+
+- project:
+ name: bldr-ubuntu18-c-go
<<: *it_dev_docker_common
<<: *it_dev_docker_common