Refactor: JJB code
- Fix shellcheck errors: SC1090, SC2164 and warnings
- Refactor yaml to standardize it across the repo with prettier
- Refactor with yamllint
Change-Id: Ie36c4a3af173fa3609cd4e904775be54b4a56990
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
diff --git a/jjb/ric-app-ad/ric-app-ad.yaml b/jjb/ric-app-ad/ric-app-ad.yaml
index 423acb5..51cad32 100644
--- a/jjb/ric-app-ad/ric-app-ad.yaml
+++ b/jjb/ric-app-ad/ric-app-ad.yaml
@@ -5,8 +5,7 @@
views:
- project-view
-- _ad_common: &ad_common
- # required even though overridden everywhere
+- _ad_common: &ad_common # required even though overridden everywhere
name: ad-common
# git repo
project: ric-app/ad
@@ -30,14 +29,14 @@
# source of docker tag
container-tag-method: yaml-file
# use host network
- docker-build-args: '--network=host'
+ docker-build-args: "--network=host"
build-node: ubuntu1804-docker-4c-4g
# do not trigger on changes in docs, releases
gerrit_trigger_file_paths:
- - compare-type: REG_EXP
- pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
+ - compare-type: REG_EXP
+ pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
jobs:
- - '{project-name}-gerrit-docker-jobs'
+ - "{project-name}-gerrit-docker-jobs"
stream:
- master:
branch: master
@@ -49,10 +48,9 @@
# container release requires docker
build-node: centos7-docker-2c-8g
jobs:
- - '{project-name}-gerrit-release-jobs'
+ - "{project-name}-gerrit-release-jobs"
-- _ad_python: &ad_python
- # settings for python builds
+- _ad_python: &ad_python # settings for python builds
name: ad-python
# the install script assumes an ubuntu image
build-node: ubuntu1804-builder-2c-2g
@@ -69,8 +67,8 @@
name: ric-app-ad-py-verify
# do not trigger on changes in docs, releases
gerrit_trigger_file_paths:
- - compare-type: REG_EXP
- pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
+ - compare-type: REG_EXP
+ pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
jobs:
- gerrit-tox-verify
stream:
@@ -83,12 +81,12 @@
name: ric-app-ad-sonarqube
sonar-project-file: ""
sonar-properties: |
- sonar.login={sonarcloud_api_token}
- sonar.projectKey={sonarcloud_project_organization}_{project-name}
- sonar.projectName={project-name}
- sonar.organization={sonarcloud_project_organization}
- sonar.build.sourceEncoding=UTF-8
- sonar.sources=ad
- sonar.python.coverage.reportPaths=coverage.xml
+ sonar.login={sonarcloud_api_token}
+ sonar.projectKey={sonarcloud_project_organization}_{project-name}
+ sonar.projectName={project-name}
+ sonar.organization={sonarcloud_project_organization}
+ sonar.build.sourceEncoding=UTF-8
+ sonar.sources=ad
+ sonar.python.coverage.reportPaths=coverage.xml
jobs:
- gerrit-tox-sonarqube