Improve doc in maven job groups

Improve documentation about use of git, maven, docker.
Fold in maven-docker-job-groups file content and drop that file.
Move maven-docker test file into maven-jobs subdirectory.
No functional change.

Issue: RELENG-908
Change-Id: Ifca5364acfcd9afdb98b25afeb1d089d95311e34
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

diff --git a/.jjb-test/lf-maven-docker-jobs.yaml b/.jjb-test/lf-maven-jobs/lf-maven-docker-jobs.yaml
similarity index 100%
rename from .jjb-test/lf-maven-docker-jobs.yaml
rename to .jjb-test/lf-maven-jobs/lf-maven-docker-jobs.yaml

diff --git a/jjb/lf-maven-docker-job-groups.yaml b/jjb/lf-maven-docker-job-groups.yaml
deleted file mode 100644 (file)
index 2a68f01..0000000
--- a/jjb/lf-maven-docker-job-groups.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- job-group:
-    name: "{project-name}-maven-docker-jobs"
-
-    # This job group contains all the recommended jobs that should be deployed
-    # for any maven docker project.
-
-    jobs:
-      - gerrit-maven-docker-merge
-      - gerrit-maven-docker-stage
-      - gerrit-maven-docker-verify
-
-- job-group:
-    name: "{project-name}-github-maven-docker-jobs"
-
-    # This job group contains all the recommended jobs that should be deployed
-    # for any maven docker project that is using github.
-
-    jobs:
-      - github-maven-docker-merge
-      - github-maven-docker-stage
-      - github-maven-docker-verify

diff --git a/jjb/lf-maven-job-groups.yaml b/jjb/lf-maven-job-groups.yaml
index 142d9ef..9f7ee72 100644 (file)
--- a/jjb/lf-maven-job-groups.yaml
+++ b/jjb/lf-maven-job-groups.yaml
@@ -3,7 +3,7 @@
     name: "{project-name}-maven-jobs"
 
     # This job group contains all the recommended jobs that should be deployed
-    # for any project ci.
+    # for a Java project in Gerrit that builds with maven.
 
     jobs:
       - gerrit-maven-clm
@@ -16,7 +16,7 @@
     name: "{project-name}-github-maven-jobs"
 
     # This job group contains all the recommended jobs that should be deployed
-    # for any project ci that is using github.
+    # for a Java project in Github that builds with maven.
 
     jobs:
       - github-maven-clm
@@ -24,11 +24,35 @@
       - github-maven-stage
       - github-maven-verify
 
+- job-group:
+    name: "{project-name}-gerrit-maven-docker-jobs"
+
+    # This job group contains all the recommended jobs that should be deployed
+    # for a Java project in Gerrit that builds with maven and docker.
+
+    jobs:
+      - gerrit-maven-clm
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+      - gerrit-maven-docker-verify
+
+- job-group:
+    name: "{project-name}-github-maven-docker-jobs"
+
+    # This job group contains all the recommended jobs that should be deployed
+    # for a Java project in Github that builds with maven and docker.
+
+    jobs:
+      - github-maven-clm
+      - github-maven-docker-merge
+      - github-maven-docker-stage
+      - github-maven-docker-verify
+
 - job-group:
     name: "{project-name}-maven-javadoc-jobs"
 
     # This job group contains all the recommended jobs that should be deployed
-    # for any project ci.
+    # for a Java project in Gerrit that publishes javadoc with maven.
 
     jobs:
       - gerrit-maven-javadoc-publish
@@ -38,7 +62,7 @@
     name: "{project-name}-github-maven-javadoc-jobs"
 
     # This job group contains all the recommended jobs that should be deployed
-    # for any project ci.
+    # for a Java project in Github that publishes javadoc with maven.
 
     jobs:
       - github-maven-javadoc-publish