From: Andrew Grimberg Date: Mon, 20 Aug 2018 16:19:08 +0000 (+0000) Subject: Merge "Add job to verify upstream global-jjb patches" X-Git-Tag: v0.24.0~8 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=87e1c2461d3f512b8a87150e3bbd17606a924b1e;hp=e9a058af2478d5b0927429955022b1a56aef9fdd;p=releng%2Fglobal-jjb.git Merge "Add job to verify upstream global-jjb patches" --- diff --git a/docs/jjb/lf-ci-jobs.rst b/docs/jjb/lf-ci-jobs.rst index 4faa9bff..c1d7db18 100644 --- a/docs/jjb/lf-ci-jobs.rst +++ b/docs/jjb/lf-ci-jobs.rst @@ -391,8 +391,6 @@ Runs `jenkins-jobs update` to update production job configuration :build-node: The node to run build on. :jenkins-ssh-credential: Credential to use for SSH. (Generally should be configured in defaults.yaml) - :mvn-settings: The name of settings file containing credentials for - the project. :Optional parameters: @@ -400,6 +398,7 @@ Runs `jenkins-jobs update` to update production job configuration :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7) :build-timeout: Timeout in minutes before aborting build. (default: 10) :git-url: URL clone project from. (default: $GIT_URL/$PROJECT) + :jjb-version: JJB version to install. (default: see job-template) :stream: Keyword that can be used to represent a release code-name. Often the same as the branch. (default: master) :submodule-recursive: Whether to checkout submodules recursively. @@ -428,8 +427,6 @@ Runs `jenkins-jobs test` to validate JJB syntax :build-node: The node to run build on. :jenkins-ssh-credential: Credential to use for SSH. (Generally should be configured in defaults.yaml) - :mvn-settings: The name of settings file containing credentials for - the project. :Optional parameters: @@ -437,6 +434,7 @@ Runs `jenkins-jobs test` to validate JJB syntax :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7) :build-timeout: Timeout in minutes before aborting build. (default: 10) :git-url: URL clone project from. (default: $GIT_URL/$PROJECT) + :jjb-version: JJB version to install. (default: see job-template) :stream: Keyword that can be used to represent a release code-name. Often the same as the branch. (default: master) :submodule-recursive: Whether to checkout submodules recursively. diff --git a/jjb/lf-c-cpp-jobs.yaml b/jjb/lf-c-cpp-jobs.yaml index 6b24038f..5e854484 100644 --- a/jjb/lf-c-cpp-jobs.yaml +++ b/jjb/lf-c-cpp-jobs.yaml @@ -15,6 +15,7 @@ build-dir: '$WORKSPACE/target' build-timeout: 15 cmake-opts: '' + cron: '@daily' git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' install-prefix: '$BUILD_DIR/output' @@ -116,6 +117,7 @@ choosing-strategy: gerrit triggers: + - timed: '{obj:cron}' - gerrit: server-name: '{gerrit-server-name}' trigger-on: @@ -150,6 +152,7 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: + - timed: '{obj:cron}' - github-pull-request: trigger-phrase: '^(stage-release)$' only-trigger-phrase: true diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml index bc1ce586..16cd33c6 100644 --- a/jjb/lf-macros.yaml +++ b/jjb/lf-macros.yaml @@ -181,7 +181,7 @@ variable: SIGUL_PASSWORD - file-id: sigul-pki variable: SIGUL_PKI - - shell: !include-raw-escape: ../shell/sigul-configuration.sh + - shell: !include-raw: ../shell/sigul-configuration.sh - builder: name: lf-pip-install @@ -211,7 +211,7 @@ name: lf-provide-sigul-configuration-cleanup # Clear sigul configuration files after we're done using them builders: - - shell: !include-raw-escape: ../shell/sigul-configuration-cleanup.sh + - shell: !include-raw: ../shell/sigul-configuration-cleanup.sh - builder: name: lf-rtd-trigger-build @@ -235,8 +235,8 @@ name: lf-sigul-install # Requires that Jenkins be configured with SIGUL_BRIDGE_IP as a global # Environment variable - builder: - - shell: !include-raw-escape: ../shell/sigul-install.sh + builders: + - shell: !include-raw: ../shell/sigul-install.sh - builder: name: lf-infra-provide-docker-cleanup @@ -310,12 +310,6 @@ # yamllint disable-line rule:line-length default: '/w/tools/hudson.tasks.Maven_MavenInstallation/{mvn-version}/bin/mvn' description: 'Maven selector to be used by shell scripts' - - string: - name: STAGING_PROFILE_ID - default: '{staging-profile-id}' - description: | - Nexus staging profile ID. - - parameter: name: lf-infra-openstack-parameters diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml index 7a574700..61fc2b93 100644 --- a/jjb/lf-maven-jobs.yaml +++ b/jjb/lf-maven-jobs.yaml @@ -128,8 +128,6 @@ mvn-opts: '{mvn-opts}' mvn-params: '{mvn-params}' mvn-version: '{mvn-version}' - # Staging repos do not make sense for CLM jobs so set it blank. - staging-profile-id: '{staging-profile-id}' - string: name: ARCHIVE_ARTIFACTS default: '{archive-artifacts}' @@ -169,7 +167,6 @@ mvn-params: '' mvn-version: mvn35 nexus-iq-stage: 'build' - staging-profile-id: '' # Unused in this job stream: master submodule-recursive: true @@ -194,8 +191,6 @@ mvn-opts: '{mvn-opts}' mvn-params: '{mvn-params}' mvn-version: '{mvn-version}' - # Staging repos do not make sense for CLM jobs so set it blank. - staging-profile-id: '{staging-profile-id}' - string: name: ARCHIVE_ARTIFACTS default: '{archive-artifacts}' @@ -320,7 +315,6 @@ mvn-opts: '' mvn-params: '' mvn-version: mvn35 - staging-profile-id: '' # Unused by the javadoc jobs stream: master submodule-recursive: true @@ -441,7 +435,6 @@ mvn-opts: '' mvn-params: '' mvn-version: mvn35 - staging-profile-id: '' # Unused by the javadoc jobs stream: master submodule-recursive: true @@ -546,7 +539,7 @@ branch: master build-days-to-keep: 30 # 30 days in case we need to troubleshoot build-timeout: 60 - cron: 'H H * * 0' # push fresh snapshot weekly + cron: '@daily' git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' java-version: openjdk8 @@ -556,7 +549,6 @@ mvn-params: '-Dmerge' mvn-version: mvn35 nexus-cut-dirs: 6 # Number of dirs in the Nexus path to remove for wget -r. - staging-profile-id: '' # Unused by this job. stream: master submodule-recursive: true @@ -660,6 +652,7 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: + - timed: '{obj:cron}' - github - pollscm: cron: '' @@ -691,7 +684,7 @@ branch: master build-days-to-keep: 30 # 30 days in case a release takes long to get approved. build-timeout: 60 - cron: '' + cron: '@daily' git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' java-version: openjdk8 @@ -711,6 +704,26 @@ # Job Configuration # ##################### + parameters: + - lf-infra-parameters: + project: '{project}' + branch: '{branch}' + stream: '{stream}' + lftools-version: '{lftools-version}' + - lf-infra-maven-parameters: + mvn-opts: '{mvn-opts}' + mvn-params: '{mvn-params}' + mvn-version: '{mvn-version}' + staging-profile-id: '{staging-profile-id}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. + - string: + name: STAGING_PROFILE_ID + default: '{staging-profile-id}' + description: Nexus staging profile ID. + builders: - lf-jacoco-nojava-workaround - lf-maven-install: @@ -814,7 +827,6 @@ mvn-params: '' mvn-version: mvn35 sonar-mvn-goal: 'sonar:sonar' - staging-profile-id: '' # Unused in this job stream: master submodule-recursive: true @@ -836,8 +848,6 @@ mvn-opts: '{mvn-opts}' mvn-params: '{mvn-params}' mvn-version: '{mvn-version}' - # Staging repos do not make sense for Sonar jobs so set it blank. - staging-profile-id: '' - string: name: ARCHIVE_ARTIFACTS default: '{archive-artifacts}' @@ -967,7 +977,6 @@ mvn-opts: '' mvn-params: '-Dstream=$STREAM' mvn-version: mvn35 - staging-profile-id: '' # Unused in this job stream: master submodule-recursive: true @@ -1097,7 +1106,6 @@ mvn-opts: '' mvn-params: '-Dstream=$STREAM' mvn-version: mvn35 - staging-profile-id: '' # Unused by this job stream: master submodule-recursive: true diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml index 441e5381..a191c094 100644 --- a/jjb/lf-python-jobs.yaml +++ b/jjb/lf-python-jobs.yaml @@ -96,7 +96,6 @@ github-url: 'https://github.com' java-version: openjdk8 nexus-iq-cli-version: 1.44.0-01 - staging-profile-id: '' # Unused in this job stream: master submodule-recursive: true diff --git a/shell/sigul-configuration.sh b/shell/sigul-configuration.sh index bdc4de67..c063b18b 100644 --- a/shell/sigul-configuration.sh +++ b/shell/sigul-configuration.sh @@ -11,7 +11,7 @@ echo "---> sigul-configuration.sh" # Ensure we fail the job if any steps fail. -set -eu -o pipefail +set -e -o pipefail # Sigul pki configuration is designed to live in ${HOME}/sigul cd "${HOME}" @@ -23,4 +23,3 @@ tar Jxf sigul.tar.xz # Any future use of $SIGUL_PASSWORD needs to have it null terminated sed -i 's/$/\x0/' "${SIGUL_PASSWORD}" - diff --git a/shell/sigul-install.sh b/shell/sigul-install.sh index 5d015ffd..8573154e 100644 --- a/shell/sigul-install.sh +++ b/shell/sigul-install.sh @@ -11,7 +11,7 @@ echo "---> sigul-install.sh" # Ensure we fail the job if any steps fail. -set -eu -o pipefail +set -e -o pipefail # Setup sigul RPM repo echo "[fedora-infra-sigul]