From fdcb4193a50803ac02b162e4b875f126b1fe8a37 Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Mon, 28 Oct 2019 08:00:36 -0400 Subject: [PATCH] Repair minor problems in self-release Add missing underscore in two echo commands in release-job.sh. Move comment for shellcheck disable onto separate line in lf-env.sh. Extend documentation of the container self-release process. Exclude lf-rtdv3.rst from WriteGoodLintBear coala processing. Change-Id: Idc363f9e2b0a6189283b8dd0385926b870a2db27 Signed-off-by: Lott, Christopher (cl778h) --- .coafile | 3 ++- docs/jjb/lf-release-jobs.rst | 26 ++++++++++++---------- jenkins-init-scripts/lf-env.sh | 3 ++- ...x-shellcheck-release-job--833955d749779d57.yaml | 7 ++++++ shell/release-job.sh | 4 ++-- 5 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 releasenotes/notes/fix-shellcheck-release-job--833955d749779d57.yaml diff --git a/.coafile b/.coafile index 86889a57..998c7a33 100644 --- a/.coafile +++ b/.coafile @@ -37,7 +37,8 @@ ignore = .git/**, docs/jjb/lf-docker-jobs.rst, docs/jjb/lf-macros.rst, docs/jjb/lf-maven-jobs.rst, - docs/jjb/lf-python-jobs.rst + docs/jjb/lf-python-jobs.rst, + docs/jjb/lf-rtdv3-jobs.rst [all.ShellCheck] bears = ShellCheckBear,SpaceConsistencyBear diff --git a/docs/jjb/lf-release-jobs.rst b/docs/jjb/lf-release-jobs.rst index 3df7f8d3..d0f5340f 100644 --- a/docs/jjb/lf-release-jobs.rst +++ b/docs/jjb/lf-release-jobs.rst @@ -116,7 +116,8 @@ The JSON schema for a container release job appears below. type: "string" -An example of a container release file appears below. The job applies the +An example of a container release file appears below. The job tags the +git repository at the specified commit reference. The job applies the container_release_tag string to all released containers. The job uses the per-container version strings to pull images from the container registry. @@ -129,6 +130,7 @@ per-container version strings to pull images from the container registry. container_pull_registry: 'nexus.onap.org:10003" container_push_registry: 'nexus.onap.org:10002" project: 'test' + ref: d1b9cd2dd345fbeec0d3e2162e008358b8b663b2 containers: - name: test-backend version: 1.0.0-20190806T184921Z @@ -136,20 +138,20 @@ per-container version strings to pull images from the container registry. version: 1.0.0-20190806T184921Z -.. note:: - - Job should appear under gerrit-maven-stage - -Example of a terse Jenkins job to call the global-jjb macro: +Example of a Jenkins job configuration that uses the global-jjb +templates for Gerrit: .. code-block:: none - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + - project: + name: my-project-release + project: my-project + project-name: my-project + build-node: centos7-docker-4c-4g + mvn-settings: my-project-settings + jobs: + - '{project-name}-gerrit-release-jobs' + .. note:: diff --git a/jenkins-init-scripts/lf-env.sh b/jenkins-init-scripts/lf-env.sh index 252328f8..a6907f39 100644 --- a/jenkins-init-scripts/lf-env.sh +++ b/jenkins-init-scripts/lf-env.sh @@ -72,7 +72,8 @@ function lf-activate() function lf-set-maven-options() { - # shellcheck disable=SC2034 # Disable 'unused-variable' check + # Disable 'unused-variable' check + # shellcheck disable=SC2034 maven_options="--show-version --batch-mode -Djenkins \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r" diff --git a/releasenotes/notes/fix-shellcheck-release-job--833955d749779d57.yaml b/releasenotes/notes/fix-shellcheck-release-job--833955d749779d57.yaml new file mode 100644 index 00000000..49e456e4 --- /dev/null +++ b/releasenotes/notes/fix-shellcheck-release-job--833955d749779d57.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Add missing underscore in two echo commands in release-job.sh. + Move comment for shellcheck disable to new line in lf-env.sh. + Extend documentation of the container self-release process. + Exclude lf-rtdv3.rst from WriteGoodBear coala processing. diff --git a/shell/release-job.sh b/shell/release-job.sh index 7080a4e6..7b22b280 100644 --- a/shell/release-job.sh +++ b/shell/release-job.sh @@ -78,8 +78,8 @@ set_variables_maven(){ # Continuing displaying Release Information (Maven) printf "\t%-30s\n" RELEASE_MAVEN_INFO: printf "\t%-30s %s\n" VERSION: $VERSION - printf "\t%-30s %s\n" LOG DIR: $LOG_DIR - printf "\t%-30s %s\n" LOGS URL: $LOGS_URL + printf "\t%-30s %s\n" LOG_DIR: $LOG_DIR + printf "\t%-30s %s\n" LOGS_URL: $LOGS_URL } set_variables_container(){ -- 2.16.6