Merge "Use a more exact grep for fetching cfg options"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
deleted file mode 100644 (file)
index ce05348..0000000
--- a/.pre-commit-config.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v1.3.0
-    hooks:
-      - id: trailing-whitespace

diff --git a/info-schema b/info-schema
index c98a470..bb596c2 100644 (file)
--- a/info-schema
+++ b/info-schema
@@ -13,7 +13,6 @@ $id: 'https://github.com/lfit/releng-global-jjb/blob/master/info-schema'
 
 required:
   - 'project'
-  - 'version'
   - 'project_creation_date'
   - 'project_category'
   - 'lifecycle_state'

diff --git a/jenkins-init-scripts/README b/jenkins-init-scripts/README
index 8548786..2d85978 100644 (file)
--- a/jenkins-init-scripts/README
+++ b/jenkins-init-scripts/README
@@ -11,5 +11,5 @@ it to Jenkins for job use.
 To use this create a managed file in Jenkins with the contents:
 
     #!/bin/bash
-    git clone https://gerrit.example.org/r/ci-management.git /opt/ciman
+    git clone --recurse-submodules https://gerrit.example.org/r/ci-management.git /opt/ciman
     /opt/ciman/jjb/global-jjb/jenkins-init-scripts/init.sh

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 788dc46..3bb493c 100644 (file)
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -144,6 +144,10 @@
         pattern: '.*\.groovy'
       - compare-type: REG_EXP
         pattern: '.*\.sh'
+      - compare-type: REG_EXP
+        pattern: '.*\.bat'
+      - compare-type: REG_EXP
+        pattern: '.*\.ps1'
       - compare-type: REG_EXP
         pattern: '.*\.(yaml|yml)'
       - compare-type: REG_EXP
@@ -153,6 +157,8 @@
     github_included_regions:
       - '.*\.groovy'
       - '.*\.sh'
+      - '.*\.bat'
+      - '.*\.ps1'
       - '.*\.(yaml|yml)'
       - '.*\/global-jjb'
 
@@ -873,6 +879,10 @@
               file-paths:
                 - compare-type: REG_EXP
                   pattern: 'packer\/provision\/.*\.sh'
+                - compare-type: REG_EXP
+                  pattern: 'packer\/provision\/.*\.bat'
+                - compare-type: REG_EXP
+                  pattern: 'packer\/provision\/.*\.ps1'
                 - compare-type: REG_EXP
                   pattern: 'packer\/provision\/{templates}\.yaml'
                 - compare-type: REG_EXP
@@ -925,6 +935,8 @@
           # included-regions MUST match Gerrit Trigger file-paths
           included-regions:
             - 'packer\/provision\/.*\.sh'
+            - 'packer\/provision\/.*\.bat'
+            - 'packer\/provision\/.*\.ps1'
             - 'packer\/provision\/{templates}\.yaml'
             - 'packer\/provision\/local-{templates}\.yaml'
             - 'packer\/templates\/{templates}\.json'

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 6a0cab9..3db4c2b 100644 (file)
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -97,12 +97,12 @@
     builders:
       - inject:
           properties-content: |
-              PROJECT='{project}'
-              GERRIT_COMMIT_MESSAGE='{gerrit-commit-message}'
-              GERRIT_HOST='{gerrit-host}'
-              GERRIT_TOPIC='{gerrit-topic}'
-              GERRIT_USER='{gerrit-user}'
-              REVIEWERS_EMAIL='{reviewers-email}'
+              PROJECT={project}
+              GERRIT_COMMIT_MESSAGE={gerrit-commit-message}
+              GERRIT_HOST={gerrit-host}
+              GERRIT_TOPIC={gerrit-topic}
+              GERRIT_USER={gerrit-user}
+              REVIEWERS_EMAIL={reviewers-email}
       - shell: !include-raw-escape: ../shell/gerrit-push-patch.sh
 
 - builder:

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index a647d9e..e55f11c 100644 (file)
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -436,6 +436,10 @@
       - lf-infra-tox-parameters:
           tox-dir: '{tox-dir}'
           tox-envs: '{tox-envs}'
+      - bool:
+          name: PARALLEL
+          default: '{parallel}'
+          description: Tox test type used to configure serial or parallel testing.
 
     wrappers:
       - lf-infra-wrappers:
@@ -487,13 +491,6 @@
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: gerrit
 
-    parameters:
-      - bool:
-          name: PARALLEL
-          default: '{parallel}'
-          description: Tox test type used to configure serial or parallel testing.
-
-
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'

diff --git a/tox.ini b/tox.ini
index c5578f7..2d4d91e 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,14 +1,8 @@
 [tox]
 minversion = 1.6
-envlist = check-hooks,coala,jjb,jjb-compare-xml,license
+envlist = coala,jjb,jjb-compare-xml,license
 skipsdist = true
 
-[testenv:check-hooks]
-deps = pre-commit
-commands =
-    pre-commit install
-    pre-commit run --all-files
-
 [testenv:coala]
 basepython = python3
 deps =