Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Activate virtual env for logs-deploy
[releng/global-jjb.git]
/
jjb
/
lf-python-jobs.yaml
diff --git
a/jjb/lf-python-jobs.yaml
b/jjb/lf-python-jobs.yaml
index
c3206e5
..
8d3c885
100644
(file)
--- a/
jjb/lf-python-jobs.yaml
+++ b/
jjb/lf-python-jobs.yaml
@@
-4,11
+4,13
@@
##########
- builder:
##########
- builder:
- name: lf-infra-
clm-python
+ name: lf-infra-
nexus-iq-python-cli
builders:
- inject:
builders:
- inject:
- properties-content: "CLM_PROJECT_NAME={clm-project-name}"
- - shell: !include-raw-escape: ../shell/nexus-iq-cli.sh
+ properties-content: |
+ NEXUS_IQ_PROJECT_NAME={nexus-iq-project-name}
+ REQUIREMENTS_FILE={requirements-file}
+ - shell: !include-raw-escape: ../shell/nexus-iq-python-cli.sh
- builder:
name: lf-infra-tox-install
- builder:
name: lf-infra-tox-install
@@
-63,39
+65,36
@@
publishers:
- lf-infra-publish
publishers:
- lf-infra-publish
-#################
-#
Python XC
CLM #
-#################
+#################
###
+#
Tox Nexus IQ
CLM #
+#################
###
-- lf_
python_clm_xc: &lf_python_xc
_clm
- name: lf-
python-xc
-clm
+- lf_
tox_nexus_iq_clm: &lf_tox_nexus_iq
_clm
+ name: lf-
tox-nexus-iq
-clm
######################
# Default parameters #
######################
branch: master
######################
# Default parameters #
######################
branch: master
- build-days-to-keep: 30 # 30 days for troubleshooting purposes
- build-timeout: 60
+ build-days-to-keep: 7
+ build-timeout: 15
+ cron: "@weekly"
disable-job: false
git-url: "$GIT_URL/$PROJECT"
github-url: "https://github.com"
disable-job: false
git-url: "$GIT_URL/$PROJECT"
github-url: "https://github.com"
- java-version: openjdk8
- nexus-iq-cli-version: 1.
44.0-01
+ java-version: openjdk8
# Scanner is a jar
+ nexus-iq-cli-version: 1.
89.0-02
nexus-iq-namespace: "" # Recommend a trailing dash when set. Example: odl-
nexus-iq-namespace: "" # Recommend a trailing dash when set. Example: odl-
- pre-build-script: " # pre-build script goes here"
+ pre-build-script: "# pre-build script goes here"
+ python-version: python3
+ requirements-file: requirements.txt
stream: master
submodule-recursive: true
submodule-timeout: 10
submodule-disable: false
stream: master
submodule-recursive: true
submodule-timeout: 10
submodule-disable: false
-
- gerrit_trigger_file_paths:
- - compare-type: REG_EXP
- pattern: ".*"
-
- # github_included_regions MUST match gerrit_trigger_file_paths
- github_included_regions:
- - ".*"
+ tox-dir: "."
+ tox-envs: "clm"
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-108,35
+107,52
@@
project: "{project}"
branch: "{branch}"
stream: "{stream}"
project: "{project}"
branch: "{branch}"
stream: "{stream}"
+ - lf-infra-tox-parameters:
+ tox-dir: "{tox-dir}"
+ tox-envs: "{tox-envs}"
+ - string:
+ name: ARCHIVE_ARTIFACTS
+ default: "{archive-artifacts}"
+ description: Artifacts to archive to the logs server.
- string:
name: NEXUS_IQ_CLI_VERSION
default: "{nexus-iq-cli-version}"
- string:
name: NEXUS_IQ_CLI_VERSION
default: "{nexus-iq-cli-version}"
- description: Nexus IQ CLI
package to download and use
.
+ description: Nexus IQ CLI
jar to download and run
.
wrappers:
wrappers:
+ - lf-infra-wrappers:
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
- credentials-binding:
- username-password-separated:
credential-id: nexus-iq-xc-clm
- credentials-binding:
- username-password-separated:
credential-id: nexus-iq-xc-clm
- username: CLM_USER
- password: CLM_PASSWORD
+ username: NEXUS_IQ_USER
+ password: NEXUS_IQ_PASSWORD
+
builders:
builders:
+ - lf-infra-pre-build
- lf-update-java-alternatives:
java-version: "{java-version}"
- lf-update-java-alternatives:
java-version: "{java-version}"
+ - lf-infra-tox-install:
+ python-version: "{python-version}"
- shell: "{pre-build-script}"
- shell: "{pre-build-script}"
- - lf-infra-clm-python:
- clm-project-name: "{nexus-iq-namespace}{project-name}"
+ - lf-infra-tox-run:
+ parallel: false
+ - lf-infra-nexus-iq-python-cli:
+ nexus-iq-project-name: "{nexus-iq-namespace}{project-name}"
+ requirements-file: "{requirements-file}"
- job-template:
- job-template:
- name: "{project-name}-
python-clm-{stream}
"
- id: gerrit-
python-xc
-clm
+ name: "{project-name}-
tox-nexus-iq-clm
"
+ id: gerrit-
tox-nexus-iq
-clm
<<: *lf_python_common
<<: *lf_python_common
- <<: *lf_
python_xc
_clm
+ <<: *lf_
tox_nexus_iq
_clm
######################
# Default parameters #
######################
######################
# Default parameters #
######################
- gerrit_
clm
_triggers:
+ gerrit_
nexus_iq
_triggers:
- comment-added-contains-event:
comment-contains-value: '^Patch Set\s+\d+:\s+run-clm\s*$'
- comment-added-contains-event:
comment-contains-value: '^Patch Set\s+\d+:\s+run-clm\s*$'
@@
-156,18
+172,16
@@
choosing-strategy: default
triggers:
choosing-strategy: default
triggers:
- # Build weekly on Saturdays
- - timed: "H H * * 6"
+ - timed: "{obj:cron}"
- gerrit:
server-name: "{gerrit-server-name}"
- gerrit:
server-name: "{gerrit-server-name}"
- trigger-on: "{obj:gerrit_
clm
_triggers}"
+ trigger-on: "{obj:gerrit_
nexus_iq
_triggers}"
projects:
- project-compare-type: ANT
project-pattern: "{project}"
branches:
- branch-compare-type: ANT
branch-pattern: "**/{branch}"
projects:
- project-compare-type: ANT
project-pattern: "{project}"
branches:
- branch-compare-type: ANT
branch-pattern: "**/{branch}"
- file-paths: "{obj:gerrit_trigger_file_paths}"
skip-vote:
successful: true
failed: true
skip-vote:
successful: true
failed: true
@@
-175,10
+189,10
@@
notbuilt: true
- job-template:
notbuilt: true
- job-template:
- name: "{project-name}-
python-clm-{stream}
"
- id: github-
python-xc
-clm
+ name: "{project-name}-
tox-nexus-iq
"
+ id: github-
tox-nexus-iq
-clm
<<: *lf_python_common
<<: *lf_python_common
- <<: *lf_
python_xc
_clm
+ <<: *lf_
tox_nexus_iq
_clm
properties:
- lf-infra-properties:
properties:
- lf-infra-properties:
@@
-198,8
+212,7
@@
jenkins-ssh-credential: "{jenkins-ssh-credential}"
triggers:
jenkins-ssh-credential: "{jenkins-ssh-credential}"
triggers:
- # Build weekly on Saturdays
- - timed: "H H * * 6"
+ - timed: "{obj:cron}"
- github-pull-request:
trigger-phrase: "^run-clm$"
only-trigger-phrase: false
- github-pull-request:
trigger-phrase: "^run-clm$"
only-trigger-phrase: false
@@
-208,7
+221,6
@@
github-hooks: true
white-list-target-branches:
- "{branch}"
github-hooks: true
white-list-target-branches:
- "{branch}"
- included-regions: "{obj:github_included_regions}"
#########################
# Python Sonar with Tox #
#########################
# Python Sonar with Tox #
@@
-243,6
+255,9
@@
sonarcloud-project-key: ""
sonarcloud-project-organization: ""
sonarcloud-api-token: ""
sonarcloud-project-key: ""
sonarcloud-project-organization: ""
sonarcloud-api-token: ""
+ # SonarCloud scan using jdk8 will become deprecated by Oct, 2020
+ # Projects not compatible with jdk11 can set java-version to something else
+ sonarcloud-java-version: openjdk11
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
@@
-320,6
+335,7
@@
# yamllint disable-line rule:line-length
sonarcloud-project-organization: "{sonarcloud-project-organization}"
sonarcloud-api-token: "{sonarcloud-api-token}"
# yamllint disable-line rule:line-length
sonarcloud-project-organization: "{sonarcloud-project-organization}"
sonarcloud-api-token: "{sonarcloud-api-token}"
+ sonarcloud-java-version: "{sonarcloud-java-version}"
# With SonarQube
- conditional-step:
condition-kind: not
# With SonarQube
- conditional-step:
condition-kind: not