X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=3ceda0d1ec8dc5fa6fced608fb947bd57350a898;hb=608a64eaf839ab14e6cdf3d597b9d585beb2dc39;hp=9f740462a68bde5f9921a6f73cb44d01a4fb09f8;hpb=e0a9d10d3d6b488ed3a3b00050b34d9faee4a6f8;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 9f740462..3ceda0d1 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -11,6 +11,14 @@
     builders:
       - shell: !include-raw: ../shell/comment-to-gerrit.sh
 
+- builder:
+    name: lf-ansible-config-file-provider
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: "ansible-cfg"
+              target: "$HOME/.ansible/ansible.cfg"
+
 - builder:
     name: lf-fetch-dependent-patches
     builders:
@@ -112,6 +120,7 @@
 - builder:
     name: lf-infra-packer-build
     builders:
+      - lf-ansible-config-file-provider
       - conditional-step:
           condition-kind: boolean-expression
           condition-expression: "{openstack}"
@@ -125,6 +134,7 @@
       - config-file-provider:
           files:
             - file-id: "{packer-cloud-settings}"
+              target: "$HOME/.config/jenkins_jobs/cloud-env.pkrvars.hcl"
               variable: CLOUDENV
       - inject:
           properties-content: |
@@ -155,10 +165,10 @@
       - config-file-provider:
           files:
             - file-id: "{packer-cloud-settings}"
+              target: "$HOME/.config/jenkins_jobs/cloud-env.pkrvars.hcl"
               variable: CLOUDENV
       - inject:
           properties-content: |
-            PACKER_BUILDER={packer-builder}
             PACKER_VERSION={packer-version}
       - shell: !include-raw-escape:
           - ../shell/packer-install.sh
@@ -383,6 +393,7 @@
           properties: "{sonar-properties}"
           java-opts: "{sonar-java-opts}"
           additional-arguments: "{sonar-additional-args}"
+          jdk: "{sonar-jdk}"
 
 - builder:
     name: lf-infra-sonar-with-prescan
@@ -570,6 +581,38 @@
           default: "{node-version}"
           description: Version of NodeJS to install.
 
+- parameter:
+    name: lf-infra-sonar-cli-parameters
+    parameters:
+      - string:
+          name: TOX_DIR
+          default: "{tox-dir}"
+          description: |
+            Path to directory containing tox.ini file.
+      - string:
+          name: TOX_ENVS
+          default: "{tox-envs}"
+          description: |
+            Tox environments to run build against.
+      - string:
+          name: SONAR_SCANNER_VERSION
+          default: "{sonar-scanner-version}"
+          description: |
+            Version of sonar scanner to use.
+            Example: 4.7.0.2747
+      - string:
+          name: SONAR_SCANNER_HOME
+          default: "{sonar-scanner-home}"
+          description: |
+            Sonar scanner home directory.
+            Example: $WORKSPACE/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux
+      - string:
+          name: SONAR_SCANNER_OPTS
+          default: "{sonar-scanner-opts}"
+          description: |
+            Sonar scanner Java options.
+            Example: -server
+
 - parameter:
     name: lf-infra-tox-parameters
     parameters:
@@ -583,7 +626,7 @@
           default: "{tox-envs}"
           description: |
             Tox environments to run build against.
-            Example: docs,py2,py3
+            Example: docs,py3
 
 - parameter:
     name: lf-build-with-parameters-maven-release
@@ -642,7 +685,7 @@
           class-pattern: "**/classes"
           source-pattern: "**/src/main/java"
           # yamllint disable-line rule:line-length
-          exclusion-pattern: "**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**"
+          exclusion-pattern: "{exclude-pattern}"
           status-update: true
           targets:
             - branch: