X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-templates-c.yaml;h=f78cce76a4d772be48dffc1a775f24dd0542202f;hb=refs%2Fheads%2Fmaster;hp=0df129366664d95aa9ceb233e3dd7285c5296ee7;hpb=7ec70d5407723e1f9f88d64c01c7386ee045163d;p=ci-management.git

diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml
index 0df129366..9cccda452 100644
--- a/jjb/global-templates-c.yaml
+++ b/jjb/global-templates-c.yaml
@@ -3,7 +3,7 @@
 # COMMON FUNCTIONS #
 ####################
 
-- c_job_common: &c_job_common
+- _c_job_common: &c_job_common
     name: c-job-common
 
     ######################
@@ -20,34 +20,34 @@
     #####################
 
     project-type: freestyle
-    node: '{build-node}'
+    node: "{build-node}"
     disabled: false
 
     properties:
       - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          stream: '{stream}'
+          project: "{project}"
+          branch: "{branch}"
+          stream: "{stream}"
 
     scm:
       - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '$GIT_URL/$PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-disable: '{submodule-disable}'
-          submodule-timeout: '{submodule-timeout}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          git-url: "$GIT_URL/$PROJECT"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-disable: "{submodule-disable}"
+          submodule-timeout: "{submodule-timeout}"
           choosing-strategy: default
 
     wrappers:
       - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     publishers:
       - lf-infra-publish
@@ -59,20 +59,20 @@
     # Required Variables:
     #   script:         build script to execute
     #
-    name: '{project-name}-{stream}-verify-c'
+    name: "{project-name}-{stream}-verify-c"
     id: gerrit-verify-c
     <<: *c_job_common
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**"
 
     builders:
       - lf-infra-pre-build
-      - shell: '{script}'
+      - shell: "{script}"
 
 - job-template:
     # Job template for building & pushing docker images
@@ -81,23 +81,22 @@
     #  1. login to the docker registry
     #  2. run a specified shell builder
     #
-    name: '{project-name}-{stream}-docker-c-shell-daily'
+    name: "{project-name}-{stream}-docker-c-shell-daily"
     id: gerrit-docker-c-shell-daily
     <<: *c_job_common
-    node: 'ubuntu1604-docker-8c-8g'
+    node: "ubuntu1804-docker-8c-8g"
 
     triggers:
       # 12 AM UTC
-      - timed: '@daily'
       - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
 
     builders:
       - lf-infra-pre-build
       - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
       - docker-login
-      - shell: '{script}'
+      - shell: "{script}"