From: Eric Ball Date: Thu, 4 May 2023 19:56:20 +0000 (-0700) Subject: Refactor: Cleanup JJB for pre-commit X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=9d378480b8a3fdfb13acc717b836ac719f8efa48;p=ci-management.git Refactor: Cleanup JJB for pre-commit This includes removing the file "static-slaves-ci-jobs", which does not conform to modern naming conventions, and is no longer needed. Change-Id: If1495c79ba85dea00f7a423f3055abee517dce7e Signed-off-by: Eric Ball Signed-off-by: Anil Belur --- diff --git a/jjb/addon-onap/addon-onap.yaml b/jjb/addon-onap/addon-onap.yaml index 9f49573..c5b26af 100644 --- a/jjb/addon-onap/addon-onap.yaml +++ b/jjb/addon-onap/addon-onap.yaml @@ -29,4 +29,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml b/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml index ea35e04..0ec2cf1 100644 --- a/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml +++ b/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml @@ -29,4 +29,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/akraino-templates/akraino-5g-mec-templates.yaml b/jjb/akraino-templates/akraino-5g-mec-templates.yaml index 95cbdb0..423e2b5 100644 --- a/jjb/akraino-templates/akraino-5g-mec-templates.yaml +++ b/jjb/akraino-templates/akraino-5g-mec-templates.yaml @@ -1,7 +1,7 @@ --- - job-template: id: 5g-mec-project-stream-verify - name: '{project-name}-{stream}-verify' + name: "{project-name}-{stream}-verify" archive-artifacts: > **/*.log build-days-to-keep: 30 @@ -9,66 +9,66 @@ stream: master project-type: freestyle submodule-recursive: true - node: '{build-node}' + node: "{build-node}" properties: - lf-infra-properties: - build-days-to-keep: '{build-days-to-keep}' + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - lftools-version: '{lftools-version}' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + lftools-version: "{lftools-version}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false - choosing-strategy: 'gerrit' + choosing-strategy: "gerrit" triggers: - gerrit: - server-name: '{gerrit-server-name}' + server-name: "{gerrit-server-name}" trigger-on: - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' + exclude-drafts: "false" + exclude-trivial-rebase: "false" + exclude-no-code-change: "false" - change-merged-event - draft-published-event - comment-added-contains-event: - comment-contains-value: 'recheck' + comment-contains-value: "recheck" - comment-added-contains-event: - comment-contains-value: 'reverify' + comment-contains-value: "reverify" projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' + - project-compare-type: "ANT" + project-pattern: "{project}" branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'true' + - branch-compare-type: "ANT" + branch-pattern: "**/{branch}" + disable-strict-forbidden-file-verification: "true" forbidden-file-paths: - compare-type: ANT - pattern: 'docs/**' + pattern: "docs/**" - compare-type: REG_EXP - pattern: 'INFO.yaml' + pattern: "INFO.yaml" readable-message: true builders: diff --git a/jjb/akraino-templates/akraino-iec-macros.yaml b/jjb/akraino-templates/akraino-iec-macros.yaml index 950d867..502a5eb 100644 --- a/jjb/akraino-templates/akraino-iec-macros.yaml +++ b/jjb/akraino-templates/akraino-iec-macros.yaml @@ -3,87 +3,87 @@ # PARAMETERS # ############## - parameter: - name: 'iec-defaults' + name: "iec-defaults" parameters: - string: name: INSTALLER_IP - default: '10.20.0.2' - description: 'IP of the installer' + default: "10.20.0.2" + description: "IP of the installer" - string: name: SSH_KEY - default: '/var/lib/opnfv/mcp.rsa' - description: 'Path to private SSH key to access environment nodes' + default: "/var/lib/opnfv/mcp.rsa" + description: "Path to private SSH key to access environment nodes" - string: name: EXTERNAL_NETWORK - default: 'floating_net' - description: 'external network for test' + default: "floating_net" + description: "external network for test" - string: name: CI_DEBUG - default: 'false' - description: 'Show debug output information' + default: "false" + description: "Show debug output information" - string: name: ARCHIVE_ARTIFACTS - default: '**/*.log' + default: "**/*.log" description: Artifacts to archive to the logs server. # Usecase params are both installer and OS specific - parameter: &k8s_fuel_ubuntu1804_parameter - name: 'fuel-ubuntu1804-parameters' + name: "fuel-ubuntu1804-parameters" parameters: - string: &k8s_master_ip name: K8S_MASTER_IP - default: '172.16.10.36' - description: 'IP address to connect to the K8s master' + default: "172.16.10.36" + description: "IP address to connect to the K8s master" - string: &k8s_ssh_user name: K8S_SSH_USER - default: 'ubuntu' - description: 'SSH username to connect to the K8s master ' + default: "ubuntu" + description: "SSH username to connect to the K8s master " - string: &k8s_ssh_password name: K8S_SSH_PASSWORD - default: '' - description: 'SSH password to connect to the K8s master' + default: "" + description: "SSH password to connect to the K8s master" - string: &k8s_ssh_key name: K8S_SSH_KEY - default: '/var/lib/opnfv/mcp.rsa' - description: 'SSH key to connect to the K8s master' + default: "/var/lib/opnfv/mcp.rsa" + description: "SSH key to connect to the K8s master" - parameter: <<: *k8s_fuel_ubuntu1804_parameter - name: 'fuel-ubuntu1804-defaults' + name: "fuel-ubuntu1804-defaults" - parameter: - name: 'fuel-centos7-defaults' + name: "fuel-centos7-defaults" parameters: - string: <<: *k8s_master_ip - string: <<: *k8s_ssh_user - default: 'centos' + default: "centos" - string: <<: *k8s_ssh_password - string: <<: *k8s_ssh_key - parameter: - name: 'compass-ubuntu1804-defaults' + name: "compass-ubuntu1804-defaults" parameters: - string: <<: *k8s_master_ip - default: '10.1.0.50' + default: "10.1.0.50" - string: <<: *k8s_ssh_user - default: 'root' + default: "root" - string: <<: *k8s_ssh_password - default: 'root' + default: "root" - string: <<: *k8s_ssh_key - default: '' + default: "" ######################## # publisher macros ######################## - publisher: - name: 'iec-default-publisher' + name: "iec-default-publisher" publishers: - email: recipients: armband@enea.com @@ -97,18 +97,18 @@ # Akraino IEC CI Baremetal Triggers running against master branch # ---------------------------------------------------------------- - trigger: - name: 'iec-type2-fuel-virtual-ubuntu1804-daily-master-trigger' + name: "iec-type2-fuel-virtual-ubuntu1804-daily-master-trigger" triggers: - - timed: '0 1 * * 2,6' + - timed: "0 1 * * 2,6" - trigger: - name: 'iec-type2-fuel-baremetal-ubuntu1804-daily-master-trigger' + name: "iec-type2-fuel-baremetal-ubuntu1804-daily-master-trigger" triggers: - - timed: '0 1 * * *' + - timed: "0 1 * * *" - trigger: - name: 'iec-type2-fuel-virtual-centos7-daily-master-trigger' + name: "iec-type2-fuel-virtual-centos7-daily-master-trigger" triggers: - - timed: '0 1 * * 4,7' + - timed: "0 1 * * 4,7" - trigger: - name: 'iec-type1-compass-virtual-ubuntu1804-daily-master-trigger' + name: "iec-type1-compass-virtual-ubuntu1804-daily-master-trigger" triggers: - - timed: '0 19 * * *' + - timed: "0 19 * * *" diff --git a/jjb/akraino-templates/akraino-iec-templates.yaml b/jjb/akraino-templates/akraino-iec-templates.yaml index a3bfa34..6f732ec 100644 --- a/jjb/akraino-templates/akraino-iec-templates.yaml +++ b/jjb/akraino-templates/akraino-iec-templates.yaml @@ -1,54 +1,53 @@ --- - job-template: id: akraino-iec-install - name: 'iec-{iecType}-{installer}-{deploy_type}-{os}-daily-{stream}' - disabled: '{obj:disabled}' + name: "iec-{iecType}-{installer}-{deploy_type}-{os}-daily-{stream}" + disabled: "{obj:disabled}" concurrent: false - node: '{slave_label}' + node: "{slave_label}" properties: - throttle: enabled: true max-total: 4 max-per-node: 1 - option: 'project' + option: "project" - build-blocker: use-build-blocker: true blocking-jobs: - - '.*-fuel-{deploy_type}-.*' - - '.*-compass-{deploy_type}-.*' - block-level: 'NODE' + - ".*-fuel-{deploy_type}-.*" + - ".*-compass-{deploy_type}-.*" + block-level: "NODE" wrappers: - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO $IEC_TYPE' + name: "$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO $IEC_TYPE" triggers: - - 'iec-{iecType}-{installer}-{deploy_type}-{os}-daily-{stream}-trigger' + - "iec-{iecType}-{installer}-{deploy_type}-{os}-daily-{stream}-trigger" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - - '{project}-defaults' - - '{installer}-{os}-defaults' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + - "{project}-defaults" + - "{installer}-{os}-defaults" - string: name: DEPLOY_SCENARIO - default: '{scenario}' + default: "{scenario}" - string: name: IEC_TYPE - default: '{iecType}' + default: "{iecType}" builders: - trigger-builds: - - project: 'iec-{iecType}-deploy-{installer}-{deploy_type}-{os}-daily-{stream}' + - project: "iec-{iecType}-deploy-{installer}-{deploy_type}-{os}-daily-{stream}" current-parameters: true - predefined-parameters: - DEPLOY_SCENARIO={scenario} + predefined-parameters: DEPLOY_SCENARIO={scenario} same-node: true block: true - trigger-builds: - - project: 'validation-enea-daily-{stream}' + - project: "validation-enea-daily-{stream}" same-node: true current-parameters: true predefined-parameters: | @@ -61,29 +60,27 @@ OPTIONAL=false PULL=yes block: true - - project: - !j2: | - {%- if deploy_type not in ['virtual'] -%} - {%- for uc in usecase -%} - {%- for ph in phase -%} - iec-{{ iecType }}-{{ ph }}-{{ uc }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }} - {%- if not loop.last -%},{%- endif -%} - {%- endfor %} - {%- if not loop.last -%},{%- endif -%} - {%- endfor %} - {%- endif -%} + - project: !j2: | + {%- if deploy_type not in ['virtual'] -%} + {%- for uc in usecase -%} + {%- for ph in phase -%} + iec-{{ iecType }}-{{ ph }}-{{ uc }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }} + {%- if not loop.last -%},{%- endif -%} + {%- endfor %} + {%- if not loop.last -%},{%- endif -%} + {%- endfor %} + {%- endif -%} current-parameters: true same-node: true block: true block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - project: - !j2: | - {%- if deploy_type in ['virtual'] -%} - iec-{{ iecType }}-destroy-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }} - {%- endif -%} + build-step-failure-threshold: "never" + failure-threshold: "never" + unstable-threshold: "FAILURE" + - project: !j2: | + {%- if deploy_type in ['virtual'] -%} + iec-{{ iecType }}-destroy-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }} + {%- endif -%} current-parameters: false predefined-parameters: | DEPLOY_SCENARIO={scenario} @@ -93,52 +90,52 @@ - job-template: id: akraino-iec-deploy - name: 'iec-{iecType}-deploy-{installer}-{deploy_type}-{os}-daily-{stream}' + name: "iec-{iecType}-deploy-{installer}-{deploy_type}-{os}-daily-{stream}" concurrent: true - node: '{slave_label}' + node: "{slave_label}" properties: &properties - throttle: enabled: true max-total: 4 max-per-node: 1 - option: 'project' + option: "project" - build-blocker: use-build-blocker: true blocking-jobs: - - '.*-{iecType}-deploy-{installer}-{deploy_type}-.*' - - '.*-{iecType}-destroy-{installer}-{deploy_type}-.*' - - '.*-{iecType}-install-.*-{installer}-{deploy_type}-.*' - block-level: 'NODE' + - ".*-{iecType}-deploy-{installer}-{deploy_type}-.*" + - ".*-{iecType}-destroy-{installer}-{deploy_type}-.*" + - ".*-{iecType}-install-.*-{installer}-{deploy_type}-.*" + block-level: "NODE" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - - '{project}-defaults' - - '{installer}-{os}-defaults' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + - "{project}-defaults" + - "{installer}-{os}-defaults" - string: name: DEPLOY_SCENARIO - default: '{scenario}' + default: "{scenario}" - string: name: IEC_TYPE - default: '{iecType}' + default: "{iecType}" - string: name: EXTRA_ARGS - default: '-o {os}' + default: "-o {os}" wrappers: &wrappers - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO $IEC_TYPE' + name: "$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO $IEC_TYPE" scm: &scm - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" submodule-recursive: false - submodule-timeout: '{submodule-timeout}' + submodule-timeout: "{submodule-timeout}" submodule-disable: true choosing-strategy: default @@ -147,48 +144,44 @@ description: "POD: $NODE_NAME" - conditional-step: condition-kind: regex-match - regex: 'compass' - label: '{installer}' + regex: "compass" + label: "{installer}" steps: - - shell: - !include-raw-escape: ../iec/iec-compass-build.sh - - shell: - !include-raw-escape: ../iec/iec-compass-deploy.sh - - shell: - !include-raw-escape: ../iec/iec-fdn-install.sh + - shell: !include-raw-escape: ../iec/iec-compass-build.sh + - shell: !include-raw-escape: ../iec/iec-compass-deploy.sh + - shell: !include-raw-escape: ../iec/iec-fdn-install.sh - conditional-step: condition-kind: regex-match - regex: 'fuel' - label: '{installer}' + regex: "fuel" + label: "{installer}" steps: - - shell: - !include-raw-escape: ../iec/iec-fuel-deploy.sh + - shell: !include-raw-escape: ../iec/iec-fuel-deploy.sh publishers: - iec-default-publisher - job-template: id: akraino-iec-destroy - name: 'iec-{iecType}-destroy-{installer}-{deploy_type}-{os}-daily-{stream}' + name: "iec-{iecType}-destroy-{installer}-{deploy_type}-{os}-daily-{stream}" concurrent: true - node: '{slave_label}' + node: "{slave_label}" properties: *properties parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - - '{project}-defaults' - - '{installer}-{os}-defaults' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + - "{project}-defaults" + - "{installer}-{os}-defaults" - string: name: DEPLOY_SCENARIO - default: '{scenario}' + default: "{scenario}" - string: name: IEC_TYPE - default: '{iecType}' + default: "{iecType}" - string: name: EXTRA_ARGS - default: '-EEE -o {os}' + default: "-EEE -o {os}" wrappers: *wrappers scm: *scm @@ -196,8 +189,7 @@ builders: - description-setter: description: "POD: $NODE_NAME" - - shell: - !include-raw-escape: ../iec/iec-{installer}-destroy.sh + - shell: !include-raw-escape: ../iec/iec-{installer}-destroy.sh publishers: - iec-default-publisher diff --git a/jjb/akraino-templates/akraino-jjb-docker.yaml b/jjb/akraino-templates/akraino-jjb-docker.yaml index 8e068d5..8818e0a 100644 --- a/jjb/akraino-templates/akraino-jjb-docker.yaml +++ b/jjb/akraino-templates/akraino-jjb-docker.yaml @@ -15,84 +15,84 @@ # limitations under the License. # - job-template: - id: 'akraino-project-stream-docker' - name: '{project-name}-{stream}-docker' + id: "akraino-project-stream-docker" + name: "{project-name}-{stream}-docker" project-type: freestyle - node: '{build-node}' + node: "{build-node}" parameters: - lf-infra-parameters: - project: '{project}' - branch: '{branch}' - stream: '{stream}' - lftools-version: '{lftools-version}' + project: "{project}" + branch: "{branch}" + stream: "{stream}" + lftools-version: "{lftools-version}" scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: default builders: - lf-update-java-alternatives: - java-version: '{java-version}' + java-version: "{java-version}" - lf-infra-docker-login: - global-settings-file: '{global-settings-file}' - settings-file: '{mvn-settings}' + global-settings-file: "{global-settings-file}" + settings-file: "{mvn-settings}" - inject: properties-content: | - PROJECT={project} + PROJECT={project} - shell: !include-raw-escape: - ../shell/build-docker.sh triggers: - - timed: '@daily' + - timed: "@daily" publishers: - lf-infra-publish - job-template: - id: 'akraino-project-stream-stage-docker' - name: '{project-name}-{stream}-stage-docker' + id: "akraino-project-stream-stage-docker" + name: "{project-name}-{stream}-stage-docker" project-type: freestyle - node: '{build-node}' + node: "{build-node}" parameters: - lf-infra-parameters: - project: '{project}' - branch: '{branch}' - stream: '{stream}' - lftools-version: '{lftools-version}' + project: "{project}" + branch: "{branch}" + stream: "{stream}" + lftools-version: "{lftools-version}" - string: name: STAGING_BUILD - default: 'true' + default: "true" description: Mark this as a staging build. scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: default builders: - lf-update-java-alternatives: - java-version: '{java-version}' + java-version: "{java-version}" - lf-infra-docker-login: - global-settings-file: '{global-settings-file}' - settings-file: '{mvn-settings}' + global-settings-file: "{global-settings-file}" + settings-file: "{mvn-settings}" - inject: properties-content: | - PROJECT={project} + PROJECT={project} - shell: !include-raw-escape: - ../shell/get-upstream-autostage.sh - ../shell/build-docker.sh @@ -100,8 +100,8 @@ triggers: - reverse: jobs: - - '{project}-maven-stage-{stream}' - - 'yaml_builds-{stream}-stage-config' + - "{project}-maven-stage-{stream}" + - "yaml_builds-{stream}-stage-config" publishers: - lf-infra-publish diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml index a9fc7d9..2e396bc 100644 --- a/jjb/akraino-templates/akraino-jjb-kni.yaml +++ b/jjb/akraino-templates/akraino-jjb-kni.yaml @@ -57,28 +57,28 @@ node: "{build-node}" properties: - lf-infra-properties: - build-days-to-keep: '{build-days-to-keep}' + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - branch: '{branch}' - stream: '{stream}' - lftools-version: '{lftools-version}' + project: "{project}" + branch: "{branch}" + stream: "{stream}" + lftools-version: "{lftools-version}" wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: gerrit @@ -93,15 +93,15 @@ triggers: - gerrit: - server-name: '{gerrit-server-name}' - trigger-on: '{obj:gerrit_verify_triggers}' + server-name: "{gerrit-server-name}" + trigger-on: "{obj:gerrit_verify_triggers}" projects: - project-compare-type: ANT - project-pattern: '{project}' + project-pattern: "{project}" branches: - branch-compare-type: ANT - branch-pattern: '**/{branch}' - file-paths: '{obj:gerrit_trigger_file_paths}' + branch-pattern: "**/{branch}" + file-paths: "{obj:gerrit_trigger_file_paths}" publishers: - lf-infra-publish @@ -113,44 +113,44 @@ parameters: - lf-infra-parameters: - project: '{project}' - branch: '{branch}' - stream: '{stream}' - lftools-version: '{lftools-version}' + project: "{project}" + branch: "{branch}" + stream: "{stream}" + lftools-version: "{lftools-version}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" - credentials-binding: - ssh-user-private-key: credential-id: kni-secrets key-file-variable: KNI_KEY_PATH scm: - akraino-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: gerrit - basedir: '{project-name}' + basedir: "{project-name}" - akraino-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/kni/installer.git' - refspec: 'refs/heads/master' - branch: 'master' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/kni/installer.git" + refspec: "refs/heads/master" + branch: "master" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: default - basedir: 'installer' + basedir: "installer" publishers: - postbuildscript: @@ -174,10 +174,10 @@ - job-template: id: kni-installer-verify-installer - name: '{project-name}-verify-installer' + name: "{project-name}-verify-installer" gerrit_trigger_file_paths: - compare-type: ANT - pattern: '**' + pattern: "**" <<: *kni_common build-node: centos7-builder-2c-1g @@ -190,17 +190,17 @@ - job-template: id: kni-verify-deploy-aws - name: 'kni-{project-name}-verify-deploy-aws' + name: "kni-{project-name}-verify-deploy-aws" build-node: kni-cloud <<: *kni_common_deploy gerrit_trigger_file_paths: - compare-type: ANT - pattern: 'profiles/production.aws/**' + pattern: "profiles/production.aws/**" - compare-type: ANT - pattern: 'sites/testing.aws.edge-sites.net/**' + pattern: "sites/testing.aws.edge-sites.net/**" - compare-type: ANT - pattern: 'base/**' + pattern: "base/**" builders: - lf-infra-pre-build @@ -214,18 +214,18 @@ - job-template: id: kni-verify-deploy-gcp - name: 'kni-{project-name}-verify-deploy-gcp' + name: "kni-{project-name}-verify-deploy-gcp" site: edge-sites-testing.gcp.devcluster.openshift.com build-node: kni-cloud <<: *kni_common_deploy gerrit_trigger_file_paths: - compare-type: ANT - pattern: 'profiles/production.gcp/**' + pattern: "profiles/production.gcp/**" - compare-type: ANT - pattern: 'sites/edge-sites-testing.gcp.devcluster.openshift.com/**' + pattern: "sites/edge-sites-testing.gcp.devcluster.openshift.com/**" - compare-type: ANT - pattern: 'base/**' + pattern: "base/**" builders: - lf-infra-pre-build @@ -239,18 +239,18 @@ - job-template: id: kni-verify-deploy-gcp-hub - name: 'kni-{project-name}-verify-deploy-gcp' + name: "kni-{project-name}-verify-deploy-gcp" site: kni-mgmt-hub.gcp.devcluster.openshift.com build-node: kni-cloud <<: *kni_common_deploy gerrit_trigger_file_paths: - compare-type: ANT - pattern: 'profiles/production.gcp/**' + pattern: "profiles/production.gcp/**" - compare-type: ANT - pattern: 'sites/kni-mgmt-hub.gcp.devcluster.openshift.com/**' + pattern: "sites/kni-mgmt-hub.gcp.devcluster.openshift.com/**" - compare-type: ANT - pattern: 'base/**' + pattern: "base/**" builders: - lf-infra-pre-build @@ -264,18 +264,18 @@ - job-template: id: kni-verify-deploy-gcp-ie - name: 'kni-{project-name}-verify-deploy-gcp' + name: "kni-{project-name}-verify-deploy-gcp" site: kni-ie.gcp.devcluster.openshift.com build-node: kni-cloud <<: *kni_common_deploy gerrit_trigger_file_paths: - compare-type: ANT - pattern: 'profiles/production.gcp/**' + pattern: "profiles/production.gcp/**" - compare-type: ANT - pattern: 'sites/kni-ie.gcp.devcluster.openshift.com/**' + pattern: "sites/kni-ie.gcp.devcluster.openshift.com/**" - compare-type: ANT - pattern: 'base/**' + pattern: "base/**" builders: - lf-infra-pre-build @@ -289,40 +289,40 @@ - job-template: id: kni-verify-deploy-baremetal - name: 'kni-{project-name}-verify-deploy-baremetal' + name: "kni-{project-name}-verify-deploy-baremetal" <<: *kni_common_deploy build-timeout: 120 build-node: kni-baremetal gerrit_trigger_file_paths: - compare-type: ANT - pattern: 'profiles/production.baremetal/**' + pattern: "profiles/production.baremetal/**" - compare-type: ANT - pattern: 'sites/testing.baremetal.edge-sites.net/**' + pattern: "sites/testing.baremetal.edge-sites.net/**" - compare-type: ANT - pattern: 'base/**' + pattern: "base/**" scm: - akraino-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: 'https://gerrit.akraino.org/r/kni/blueprint-pae' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "https://gerrit.akraino.org/r/kni/blueprint-pae" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: gerrit - basedir: 'kni-blueprint-pae' + basedir: "kni-blueprint-pae" - akraino-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/kni/installer.git' - refspec: 'refs/heads/master' - branch: 'master' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/kni/installer.git" + refspec: "refs/heads/master" + branch: "master" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: default - basedir: 'installer' + basedir: "installer" builders: - lf-infra-pre-build diff --git a/jjb/akraino-templates/akraino-jjb-macros.yaml b/jjb/akraino-templates/akraino-jjb-macros.yaml index 639e632..57e72de 100644 --- a/jjb/akraino-templates/akraino-jjb-macros.yaml +++ b/jjb/akraino-templates/akraino-jjb-macros.yaml @@ -1,17 +1,18 @@ +--- - scm: # enhanced version of the global-jjb, based on ta-common-macros name: akraino-lf-infra-gerrit-scm scm: - git: - credentials-id: '{jenkins-ssh-credential}' - url: '{git-url}' - refspec: '{refspec}' + credentials-id: "{jenkins-ssh-credential}" + url: "{git-url}" + refspec: "{refspec}" branches: - - 'refs/heads/{branch}' + - "refs/heads/{branch}" skip-tag: true wipe-workspace: true submodule: - recursive: '{submodule-recursive}' - timeout: '{submodule-timeout}' - choosing-strategy: '{choosing-strategy}' - basedir: '{basedir}' + recursive: "{submodule-recursive}" + timeout: "{submodule-timeout}" + choosing-strategy: "{choosing-strategy}" + basedir: "{basedir}" diff --git a/jjb/akraino-templates/akraino-jjb-templates.yaml b/jjb/akraino-templates/akraino-jjb-templates.yaml index b320852..4975463 100644 --- a/jjb/akraino-templates/akraino-jjb-templates.yaml +++ b/jjb/akraino-templates/akraino-jjb-templates.yaml @@ -16,7 +16,7 @@ # - job-template: id: akraino-project-stream-release-config - name: '{project-name}-{stream}-release-config' + name: "{project-name}-{stream}-release-config" ###################### # Default parameters # @@ -31,14 +31,14 @@ build-days-to-keep: 30 build-timeout: 60 java-version: openjdk8 - maven-repo-url: '$NEXUS_URL/content/repositories/snapshots' + maven-repo-url: "$NEXUS_URL/content/repositories/snapshots" mvn-global-settings: global-settings - mvn-opts: '' - mvn-params: '' + mvn-opts: "" + mvn-params: "" mvn-version: mvn35 nexus-shapshot-repo: snapshots repo-id: snapshots - staging-profile-id: '' # Unused by this job. + staging-profile-id: "" # Unused by this job. stream: master submodule-recursive: true upload-files-dir: /tmp/tardir @@ -48,37 +48,37 @@ ##################### project-type: freestyle - node: '{build-node}' + node: "{build-node}" properties: - lf-infra-properties: - build-days-to-keep: '{build-days-to-keep}' + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - branch: '{branch}' - stream: '{stream}' - lftools-version: '{lftools-version}' + 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}' + 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}' + staging-profile-id: "{staging-profile-id}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. - string: name: UPLOAD_FILES_PATH - default: '{upload-files-dir}' + default: "{upload-files-dir}" description: File path to generate tarball and upload to repository. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" gerrit_merge_triggers: - change-merged-event @@ -87,59 +87,58 @@ gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: '.*' + pattern: ".*" scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '{refspec}' - branch: '{branch}' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "{refspec}" + branch: "{branch}" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: default triggers: - - timed: '{obj:cron}' + - timed: "{obj:cron}" - gerrit: - server-name: '{gerrit-server-name}' - trigger-on: '{obj:gerrit_merge_triggers}' + server-name: "{gerrit-server-name}" + trigger-on: "{obj:gerrit_merge_triggers}" projects: - project-compare-type: ANT - project-pattern: '{project}' + project-pattern: "{project}" branches: - branch-compare-type: ANT - branch-pattern: '**/{branch}' - file-paths: '{obj:gerrit_trigger_file_paths}' + branch-pattern: "**/{branch}" + file-paths: "{obj:gerrit_trigger_file_paths}" builders: - lf-infra-pre-build - lf-maven-install: - mvn-version: '{mvn-version}' + mvn-version: "{mvn-version}" - lf-update-java-alternatives: - java-version: '{java-version}' + java-version: "{java-version}" - lf-provide-maven-settings: - global-settings-file: '{mvn-global-settings}' - settings-file: '{mvn-settings}' + global-settings-file: "{mvn-global-settings}" + settings-file: "{mvn-settings}" - shell: !include-raw-escape: - ../shell/make-tar.sh - lf-infra-deploy-maven-file: - global-settings-file: '{mvn-global-settings}' - settings-file: '{mvn-settings}' - mvn-version: '{mvn-version}' - repo-id: '{repo-id}' - group-id: '{group-id}' - upload-files-dir: '{upload-files-dir}' - maven-repo-url: '{maven-repo-url}' + global-settings-file: "{mvn-global-settings}" + settings-file: "{mvn-settings}" + mvn-version: "{mvn-version}" + repo-id: "{repo-id}" + group-id: "{group-id}" + upload-files-dir: "{upload-files-dir}" + maven-repo-url: "{maven-repo-url}" publishers: - lf-infra-publish - - job-template: id: akraino-project-stream-stage-config - name: '{project-name}-{stream}-stage-config' + name: "{project-name}-{stream}-stage-config" ###################### # Default parameters # @@ -153,111 +152,111 @@ **/target/surefire-reports/*-output.txt build-days-to-keep: 14 build-timeout: 60 - cron: '@daily' + cron: "@daily" disable-job: false - git-url: '$GIT_URL/$PROJECT' - github-url: 'https://github.com' + git-url: "$GIT_URL/$PROJECT" + github-url: "https://github.com" java-version: openjdk8 mvn-global-settings: global-settings mvn-goals: clean deploy - mvn-opts: '' - mvn-params: '' + mvn-opts: "" + mvn-params: "" mvn-version: mvn35 sign-artifacts: false stream: master submodule-recursive: true - upload-files-dir: m2repo # expected by "lftools deploy nexus-stage" + upload-files-dir: m2repo # expected by "lftools deploy nexus-stage" ##################### # Job Configuration # ##################### project-type: freestyle - node: '{build-node}' + node: "{build-node}" properties: - lf-infra-properties: - build-days-to-keep: '{build-days-to-keep}' + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - branch: '{branch}' - stream: '{stream}' - lftools-version: '{lftools-version}' + 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}' + 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}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. - string: name: UPLOAD_FILES_PATH - default: '{upload-files-dir}' + default: "{upload-files-dir}" description: File path to generate tarball and upload to repository. - string: name: STAGING_PROFILE_ID - default: '{staging-profile-id}' + default: "{staging-profile-id}" description: Nexus staging profile ID. - string: name: STAGING_BUILD - default: 'true' + default: "true" description: Mark this as a staging build. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" gerrit_release_triggers: - comment-added-contains-event: comment-contains-value: stage-release$ - disabled: '{disable-job}' + disabled: "{disable-job}" scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: default triggers: - - timed: '{obj:cron}' + - timed: "{obj:cron}" - gerrit: - server-name: '{gerrit-server-name}' - trigger-on: '{obj:gerrit_release_triggers}' + server-name: "{gerrit-server-name}" + trigger-on: "{obj:gerrit_release_triggers}" projects: - project-compare-type: ANT - project-pattern: '{project}' + project-pattern: "{project}" branches: - branch-compare-type: ANT - branch-pattern: '**/{branch}' + branch-pattern: "**/{branch}" builders: - lf-infra-pre-build - lf-jacoco-nojava-workaround - lf-maven-install: - mvn-version: '{mvn-version}' + mvn-version: "{mvn-version}" - lf-update-java-alternatives: - java-version: '{java-version}' + java-version: "{java-version}" - lf-provide-maven-settings: - global-settings-file: '{mvn-global-settings}' - settings-file: '{mvn-settings}' + global-settings-file: "{mvn-global-settings}" + settings-file: "{mvn-settings}" - lf-infra-create-netrc: - server-id: '{mvn-staging-id}' + server-id: "{mvn-staging-id}" - shell: !include-raw-escape: - ../shell/make-tar.sh - lf-sigul-sign-dir: - sign-artifacts: '{sign-artifacts}' - sign-dir: '$WORKSPACE/m2repo' + sign-artifacts: "{sign-artifacts}" + sign-dir: "$WORKSPACE/m2repo" sign-mode: serial - lf-maven-stage - lf-provide-maven-settings-cleanup @@ -267,7 +266,7 @@ - job-template: id: akraino-project-stream-verify - name: '{project-name}-{stream}-verify' + name: "{project-name}-{stream}-verify" archive-artifacts: > **/*.log build-days-to-keep: 30 @@ -275,67 +274,67 @@ stream: master project-type: freestyle submodule-recursive: true - node: '{build-node}' + node: "{build-node}" properties: - lf-infra-properties: - build-days-to-keep: '{build-days-to-keep}' + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - lftools-version: '{lftools-version}' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + lftools-version: "{lftools-version}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" submodule-disable: false - choosing-strategy: 'gerrit' + choosing-strategy: "gerrit" triggers: - gerrit: - server-name: '{gerrit-server-name}' + server-name: "{gerrit-server-name}" trigger-on: - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' + exclude-drafts: "false" + exclude-trivial-rebase: "false" + exclude-no-code-change: "false" - change-merged-event - draft-published-event - comment-added-contains-event: - comment-contains-value: 'recheck' + comment-contains-value: "recheck" - comment-added-contains-event: - comment-contains-value: 'reverify' + comment-contains-value: "reverify" projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' + - project-compare-type: "ANT" + project-pattern: "{project}" branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' + - branch-compare-type: "ANT" + branch-pattern: "**/{branch}" file-paths: - compare-type: ANT - pattern: '**/*' - disable-strict-forbidden-file-verification: 'true' + pattern: "**/*" + disable-strict-forbidden-file-verification: "true" forbidden-file-paths: - compare-type: ANT - pattern: 'docs/**' + pattern: "docs/**" readable-message: true builders: @@ -347,20 +346,20 @@ - job-template: id: akraino-project-build-node-init - name: '{project-name}-{build-node}-init' + name: "{project-name}-{build-node}-init" # disable_job: false - disabled: '{obj:disable_job}' + disabled: "{obj:disable_job}" concurrent: true parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' + project: "{project}" + stream: "{stream}" + branch: "{branch}" - label: - name: '{build-node}' - default: '{build-node}' - node-eligibility: 'all' + name: "{build-node}" + default: "{build-node}" + node-eligibility: "all" all-nodes: true gerrit_merge_triggers: @@ -370,30 +369,30 @@ gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: 'global-jjb' + pattern: "global-jjb" scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" submodule-recursive: true - submodule-timeout: '{submodule-timeout}' + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: default triggers: - gerrit: - server-name: '{gerrit-server-name}' - trigger-on: '{obj:gerrit_merge_triggers}' + server-name: "{gerrit-server-name}" + trigger-on: "{obj:gerrit_merge_triggers}" projects: - project-compare-type: ANT - project-pattern: '{project}' + project-pattern: "{project}" branches: - branch-compare-type: ANT - branch-pattern: '**/{branch}' - file-paths: '{obj:gerrit_trigger_file_paths}' + branch-pattern: "**/{branch}" + file-paths: "{obj:gerrit_trigger_file_paths}" builders: - description-setter: diff --git a/jjb/akraino-templates/akraino-rec-macros.yaml b/jjb/akraino-templates/akraino-rec-macros.yaml index a1129b8..ad2312a 100644 --- a/jjb/akraino-templates/akraino-rec-macros.yaml +++ b/jjb/akraino-templates/akraino-rec-macros.yaml @@ -3,49 +3,51 @@ # PARAMETERS # ############## - parameter: - name: 'rec-aarch64_baremetal-defaults' + name: "rec-aarch64_baremetal-defaults" parameters: - string: name: REC_ISO_IMAGE_NAME - default: 'https://nexus.akraino.org/content/repositories/images-snapshots/TA/images/arm64/latest/install.aarch64.iso' - description: 'REC install image' + # yamllint disable-line rule:line-length + default: "https://nexus.akraino.org/content/repositories/images-snapshots/TA/images/arm64/latest/install.aarch64.iso" + description: "REC install image" - string: name: REC_PROVISIONING_ISO_NAME - default: 'https://nexus.akraino.org/content/repositories/images-snapshots/TA/images/arm64/latest/bootcd.aarch64.iso' - description: 'REC provisioning image' + # yamllint disable-line rule:line-length + default: "https://nexus.akraino.org/content/repositories/images-snapshots/TA/images/arm64/latest/bootcd.aarch64.iso" + description: "REC provisioning image" - string: name: REC_USER_CONFIG - default: 'file:///data/rec_pod/user_config.yaml' - description: 'POD user config YAML (hosted on Jumpserver by default)' + default: "file:///data/rec_pod/user_config.yaml" + description: "POD user config YAML (hosted on Jumpserver by default)" - string: name: ARCHIVE_ARTIFACTS - default: '**/*.log' + default: "**/*.log" description: Artifacts to archive to the logs server. - string: name: SCM_REFSPEC_REMOTE_INSTALLER - default: 'refs/heads/master' - description: 'remote-installer custom git refspec' + default: "refs/heads/master" + description: "remote-installer custom git refspec" - parameter: - name: 'rec-defaults' + name: "rec-defaults" parameters: - string: name: CLUSTER_MASTER_IP - default: '192.167.10.211' - description: 'IP address to connect to the K8s master' + default: "192.167.10.211" + description: "IP address to connect to the K8s master" - string: name: CLUSTER_SSH_USER - default: 'cloudadmin' - description: 'SSH username to connect to the K8s master' + default: "cloudadmin" + description: "SSH username to connect to the K8s master" - string: name: CLUSTER_SSH_PASSWORD - default: 'admin' - description: 'SSH password to connect to the K8s master' + default: "admin" + description: "SSH password to connect to the K8s master" ######################## # trigger macros ######################## - trigger: - name: 'rec-weekly-master-trigger' + name: "rec-weekly-master-trigger" triggers: - - timed: '0 1 * * 6,7' + - timed: "0 1 * * 6,7" diff --git a/jjb/akraino-templates/akraino-rec-templates.yaml b/jjb/akraino-templates/akraino-rec-templates.yaml index b92d8e4..883f26c 100644 --- a/jjb/akraino-templates/akraino-rec-templates.yaml +++ b/jjb/akraino-templates/akraino-rec-templates.yaml @@ -1,42 +1,42 @@ --- - job-template: id: akraino-rec-deploy - name: 'rec-{slave_label}-{job_frequency}-{stream}' - disabled: '{obj:disabled}' + name: "rec-{slave_label}-{job_frequency}-{stream}" + disabled: "{obj:disabled}" concurrent: false - node: '{slave_label}' + node: "{slave_label}" properties: - throttle: enabled: true max-total: 4 max-per-node: 1 - option: 'project' + option: "project" wrappers: - build-name: - name: '$BUILD_NUMBER - Install REC Blueprint' + name: "$BUILD_NUMBER - Install REC Blueprint" triggers: - - 'rec-{job_frequency}-{stream}-trigger' + - "rec-{job_frequency}-{stream}-trigger" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - - 'rec-{slave_label}-defaults' - - 'rec-defaults' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + - "rec-{slave_label}-defaults" + - "rec-defaults" builders: - description-setter: description: "SLAVE: $NODE_NAME" - trigger-builds: - - project: 'rec-{slave_label}-install-rec-{job_frequency}-{stream}' + - project: "rec-{slave_label}-install-rec-{job_frequency}-{stream}" current-parameters: true same-node: true block: true - trigger-builds: - - project: 'validation-unh-daily-{stream}' + - project: "validation-unh-daily-{stream}" same-node: true current-parameters: true predefined-parameters: | @@ -45,22 +45,21 @@ OPTIONAL=false PULL=yes block: true - - project: - !j2: | - {%- for uc in usecase -%} - {%- for ph in phase -%} - rec-{{ slave_label }}-{{ ph }}-{{ uc }}-{{ job_frequency }}-{{ stream }} - {%- if not loop.last -%},{%- endif -%} - {%- endfor %} - {%- if not loop.last -%},{%- endif -%} - {%- endfor %} + - project: !j2: | + {%- for uc in usecase -%} + {%- for ph in phase -%} + rec-{{ slave_label }}-{{ ph }}-{{ uc }}-{{ job_frequency }}-{{ stream }} + {%- if not loop.last -%},{%- endif -%} + {%- endfor %} + {%- if not loop.last -%},{%- endif -%} + {%- endfor %} current-parameters: true same-node: true block: true block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' + build-step-failure-threshold: "never" + failure-threshold: "never" + unstable-threshold: "FAILURE" publishers: &rec-publishers - email: @@ -69,34 +68,34 @@ - job-template: id: akraino-rec-install-rec - name: 'rec-{slave_label}-install-rec-{job_frequency}-{stream}' + name: "rec-{slave_label}-install-rec-{job_frequency}-{stream}" concurrent: true - node: '{slave_label}' + node: "{slave_label}" properties: - throttle: enabled: true max-total: 4 max-per-node: 1 - option: 'project' + option: "project" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - - 'rec-{slave_label}-defaults' - - 'rec-defaults' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + - "rec-{slave_label}-defaults" + - "rec-defaults" scm: - ta-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/ta/remote-installer.git' - branch: '{branch}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/ta/remote-installer.git" + branch: "{branch}" submodule-recursive: false submodule-timeout: 10 - choosing-strategy: 'gerrit' - basedir: 'git/remote-installer' - refspec: '$SCM_REFSPEC_REMOTE_INSTALLER' + choosing-strategy: "gerrit" + basedir: "git/remote-installer" + refspec: "$SCM_REFSPEC_REMOTE_INSTALLER" builders: - description-setter: description: "SLAVE: $NODE_NAME" diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml index be0a956..ca444f8 100644 --- a/jjb/akraino-templates/akraino-ta-common-macros.yaml +++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml @@ -1,56 +1,36 @@ --- +# yamllint disable-file ############## # PARAMETERS # ############## - parameter: - name: ta-parameters-manifest + name: ta-parameters parameters: - - string: - default: refs/heads/master - description: '' - name: SCM_REFSPEC_MANIFEST - trim: 'false' - -- parameter: - name: ta-parameters-build-tools - parameters: - - string: - default: refs/heads/master - description: '' - name: SCM_REFSPEC_BUILD_TOOLS - trim: 'false' - -- parameter: - name: ta-parameters-rpmbuilder - parameters: - - string: - default: refs/heads/master - description: '' - name: SCM_REFSPEC_RPMBUILDER - trim: 'false' - -- parameter: - name: ta-parameters-ci - parameters: - - ta-parameters-manifest - - ta-parameters-build-tools - - ta-parameters-rpmbuilder - -- parameter: - name: ta-parameters-ci-ta/rpmbuilder - parameters: - - ta-parameters-manifest - - ta-parameters-build-tools - - string: - default: ta/yarf - description: '' - name: SCM_PROJECT_TO_BUILD - trim: 'false' - - string: - default: refs/heads/master - description: '' - name: SCM_PROJECT_TO_BUILD_REFSPEC - trim: 'false' + - string: + name: SCM_REFSPEC_MANIFEST + default: refs/heads/master + description: "" + trim: "false" + - string: + name: SCM_REFSPEC_BUILD_TOOLS + default: refs/heads/master + description: "" + trim: "false" + - string: + name: SCM_REFSPEC_RPMBUILDER + default: refs/heads/master + description: "" + trim: "false" + - string: + name: SCM_PROJECT_TO_BUILD + default: ta/yarf + description: "" + trim: "false" + - string: + name: SCM_PROJECT_TO_BUILD_REFSPEC + default: refs/heads/master + description: "" + trim: "false" ####### # SCM # @@ -60,43 +40,43 @@ name: ta-lf-infra-gerrit-scm scm: - git: - credentials-id: '{jenkins-ssh-credential}' - url: '{git-url}' - refspec: '{refspec}' + credentials-id: "{jenkins-ssh-credential}" + url: "{git-url}" + refspec: "{refspec}" branches: - - 'refs/heads/{branch}' + - "refs/heads/{branch}" skip-tag: true wipe-workspace: true submodule: - recursive: '{submodule-recursive}' - timeout: '{submodule-timeout}' - choosing-strategy: '{choosing-strategy}' - basedir: '{basedir}' + recursive: "{submodule-recursive}" + timeout: "{submodule-timeout}" + choosing-strategy: "{choosing-strategy}" + basedir: "{basedir}" - scm: name: ta-lf-infra-gerrit-scm-merge scm: - ta-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}' - refspec: '{refspec}' - branch: '{branch}' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' - basedir: '{basedir}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}" + refspec: "{refspec}" + branch: "{branch}" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" + basedir: "{basedir}" choosing-strategy: default - scm: name: ta-lf-infra-gerrit-scm-verify scm: - ta-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}' - refspec: '{refspec}' - branch: '{branch}' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' - basedir: '{basedir}' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}" + refspec: "{refspec}" + branch: "{branch}" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" + basedir: "{basedir}" choosing-strategy: gerrit ########### @@ -105,80 +85,81 @@ - builder: name: lf-display-node-uuid builders: - - shell: |2- + # yamllint disable rule:line-length + - shell: |2- echo "---> Node UUID:" curl -s http://169.254.169.254/openstack/latest/meta_data.json | python -c 'import sys, json; data = json.load(sys.stdin); print(data["uuid"])' || true + # yamllint enable rule:line-length - builder: name: ta-builder-tox builders: - - shell: |2- - #!/bin/bash -ex - source ~/lf-env.sh + - shell: |2- + #!/bin/bash -ex + source ~/lf-env.sh - lf-activate-venv tox - tox --version - for f in $(find $GERRIT_PROJECT -name tox.ini); do - pushd $(dirname $f) - tox - popd - done + lf-activate-venv tox + tox --version + for f in $(find $GERRIT_PROJECT -name tox.ini); do + pushd $(dirname $f) + tox + popd + done - builder: name: ta-builder-rpm builders: - - shell: |2- - #!/bin/bash -ex - # Skip RPM build in case no *.spec file is found within the {project-to-build} - if [ -n "$(find {project-to-build} -name '*.spec')" ] - then - if apt --version >/dev/null 2>&1; then - # We need a specific version of mock (1.4.14) and devtools - # not available in Ubuntu/Debian repos, so fetch them from RHEL mirrors - if [ "$(mock --version 2>/dev/null)" != '1.4.14' ]; then - sudo groupadd mock || true - sudo usermod -aG mock $USER - sudo apt update - # Explicitly install mock dependencies - sudo apt install -y createrepo alien systemd-container python-pip \ - python-peak.util.decorators yum-utils usermode pigz - wget http://vault.centos.org/centos/7.6.1810/os/x86_64/Packages/rpmdevtools-8.3-5.el7.noarch.rpm \ - https://kojipkgs.fedoraproject.org/packages/mock/1.4.14/2.el7/noarch/mock-1.4.14-2.el7.noarch.rpm - sudo alien -d *.rpm - sudo dpkg --force-overwrite -i *.deb - rm -rf *.rpm *.deb - # RHEL tools hardcode the full path for certain distro tools - sudo ln -sf /bin/tar /usr/bin/gtar - sudo ln -sf /bin/machinectl /bin/df /usr/bin/ - # Some mock dependencies are only available via pip - sudo pip install distro pyroute2 lxml urllib3 - fi - else - sudo yum install -y createrepo - fi - ta/build-tools/build_rpms.sh \ - -m ta/manifest \ - -r ta/rpmbuilder \ - -w work \ - {project-to-build} - find work/ - fi + - shell: |2- + #!/bin/bash -ex + # Skip RPM build in case no *.spec file is found within the {project-to-build} + if [ -n "$(find {project-to-build} -name '*.spec')" ]; then + if apt --version >/dev/null 2>&1; then + # We need a specific version of mock (1.4.14) and devtools + # not available in Ubuntu/Debian repos, so fetch them from RHEL mirrors + if [ "$(mock --version 2>/dev/null)" != '1.4.14' ]; then + sudo groupadd mock || true + sudo usermod -aG mock $USER + sudo apt update + # Explicitly install mock dependencies + sudo apt install -y createrepo alien systemd-container python-pip \ + python-peak.util.decorators yum-utils usermode pigz + wget http://vault.centos.org/centos/7.6.1810/os/x86_64/Packages/rpmdevtools-8.3-5.el7.noarch.rpm \ + https://kojipkgs.fedoraproject.org/packages/mock/1.4.14/2.el7/noarch/mock-1.4.14-2.el7.noarch.rpm + sudo alien -d *.rpm + sudo dpkg --force-overwrite -i *.deb + rm -rf *.rpm *.deb + # RHEL tools hardcode the full path for certain distro tools + sudo ln -sf /bin/tar /usr/bin/gtar + sudo ln -sf /bin/machinectl /bin/df /usr/bin/ + # Some mock dependencies are only available via pip + sudo pip install distro pyroute2 lxml urllib3 + fi + else + sudo yum install -y createrepo + fi + ta/build-tools/build_rpms.sh \ + -m ta/manifest \ + -r ta/rpmbuilder \ + -w work \ + {project-to-build} + find work/ + fi - builder: name: ta-builder-scm builders: - - shell: |2- - #!/bin/bash -ex - rm -rf {project} - git clone {git-url}/{project} {project} - pushd {project} - if echo {ref} | grep -q "refs/"; then - git fetch origin {ref} - git checkout FETCH_HEAD - else - git checkout {ref} - fi - popd + - shell: |2- + #!/bin/bash -ex + rm -rf {project} + git clone {git-url}/{project} {project} + pushd {project} + if echo {ref} | grep -q "refs/"; then + git fetch origin {ref} + git checkout FETCH_HEAD + else + git checkout {ref} + fi + popd - builder: name: ta-lf-infra-ship-rpms @@ -187,10 +168,10 @@ - lf-provide-maven-settings-cleanup - config-file-provider: files: - - file-id: 'ta-settings' - variable: 'SETTINGS_FILE' + - file-id: "ta-settings" + variable: "SETTINGS_FILE" - inject: - properties-content: 'ALT_NEXUS_URL=https://nexus3.akraino.org' + properties-content: "ALT_NEXUS_URL=https://nexus3.akraino.org" - lf-infra-create-netrc: server-id: rpm.snapshots - inject: @@ -213,8 +194,8 @@ - lf-provide-maven-settings-cleanup - config-file-provider: files: - - file-id: 'ta-settings' - variable: 'SETTINGS_FILE' + - file-id: "ta-settings" + variable: "SETTINGS_FILE" - lf-infra-create-netrc: server-id: images-snapshots - shell: !include-raw: @@ -229,60 +210,60 @@ - builder: name: ta-builder-job-verify builders: - - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/manifest' - ref: '$SCM_REFSPEC_MANIFEST' - - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/build-tools' - ref: '$SCM_REFSPEC_BUILD_TOOLS' - - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/rpmbuilder' - ref: '$SCM_REFSPEC_RPMBUILDER' - - ta-builder-tox - - ta-builder-rpm: - project-to-build: '$GERRIT_PROJECT' + - ta-builder-scm: + git-url: "{git-url}" + project: "ta/manifest" + ref: "$SCM_REFSPEC_MANIFEST" + - ta-builder-scm: + git-url: "{git-url}" + project: "ta/build-tools" + ref: "$SCM_REFSPEC_BUILD_TOOLS" + - ta-builder-scm: + git-url: "{git-url}" + project: "ta/rpmbuilder" + ref: "$SCM_REFSPEC_RPMBUILDER" + - ta-builder-tox + - ta-builder-rpm: + project-to-build: "$GERRIT_PROJECT" - builder: name: ta-builder-job-verify-ta/rpmbuilder builders: - - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/manifest' - ref: '$SCM_REFSPEC_MANIFEST' - - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/build-tools' - ref: '$SCM_REFSPEC_BUILD_TOOLS' - - ta-builder-scm: - git-url: '{git-url}' - project: '$SCM_PROJECT_TO_BUILD' - ref: '$SCM_PROJECT_TO_BUILD_REFSPEC' - - ta-builder-tox - - ta-builder-rpm: - # Just package some random project to verify "rpmbuilder" changes - project-to-build: '$SCM_PROJECT_TO_BUILD' + - ta-builder-scm: + git-url: "{git-url}" + project: "ta/manifest" + ref: "$SCM_REFSPEC_MANIFEST" + - ta-builder-scm: + git-url: "{git-url}" + project: "ta/build-tools" + ref: "$SCM_REFSPEC_BUILD_TOOLS" + - ta-builder-scm: + git-url: "{git-url}" + project: "$SCM_PROJECT_TO_BUILD" + ref: "$SCM_PROJECT_TO_BUILD_REFSPEC" + - ta-builder-tox + - ta-builder-rpm: + # Just package some random project to verify "rpmbuilder" changes + project-to-build: "$SCM_PROJECT_TO_BUILD" - builder: name: ta-builder-job-merge builders: - - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/manifest' - ref: '$SCM_REFSPEC_MANIFEST' - - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/build-tools' - ref: '$SCM_REFSPEC_BUILD_TOOLS' - - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/rpmbuilder' - ref: '$SCM_REFSPEC_RPMBUILDER' - - ta-builder-rpm: - project-to-build: '$GERRIT_PROJECT' - - ta-lf-infra-ship-rpms + - ta-builder-scm: + git-url: "{git-url}" + project: "ta/manifest" + ref: "$SCM_REFSPEC_MANIFEST" + - ta-builder-scm: + git-url: "{git-url}" + project: "ta/build-tools" + ref: "$SCM_REFSPEC_BUILD_TOOLS" + - ta-builder-scm: + git-url: "{git-url}" + project: "ta/rpmbuilder" + ref: "$SCM_REFSPEC_RPMBUILDER" + - ta-builder-rpm: + project-to-build: "$GERRIT_PROJECT" + - ta-lf-infra-ship-rpms - builder: name: ta-builder-install-docker @@ -334,47 +315,47 @@ name: ta-trigger-job-verify triggers: - gerrit: - server-name: '{gerrit-server-name}' + server-name: "{gerrit-server-name}" trigger-on: - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' + exclude-drafts: "false" + exclude-trivial-rebase: "false" + exclude-no-code-change: "false" - draft-published-event - comment-added-contains-event: - comment-contains-value: 'recheck' + comment-contains-value: "recheck" - comment-added-contains-event: - comment-contains-value: 'reverify' + comment-contains-value: "reverify" projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' + - project-compare-type: "ANT" + project-pattern: "{project}" branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' + - branch-compare-type: "ANT" + branch-pattern: "**/{branch}" readable-message: true skip-vote: - successful: '{gerrit-skip-vote}' - failed: '{gerrit-skip-vote}' - unstable: '{gerrit-skip-vote}' - notbuilt: '{gerrit-skip-vote}' + successful: "{gerrit-skip-vote}" + failed: "{gerrit-skip-vote}" + unstable: "{gerrit-skip-vote}" + notbuilt: "{gerrit-skip-vote}" - trigger: name: ta-trigger-job-merge triggers: - gerrit: - server-name: '{gerrit-server-name}' + server-name: "{gerrit-server-name}" trigger-on: # Not sure if it would be better to use "change-merged" here and just clone the master # branch. With the current approach the SCM can be identical in verify and merge jobs. - ref-updated-event - comment-added-contains-event: - comment-contains-value: 'remerge' + comment-contains-value: "remerge" projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' + - project-compare-type: "ANT" + project-pattern: "{project}" branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' + - branch-compare-type: "ANT" + branch-pattern: "**/{branch}" readable-message: true ############# @@ -391,9 +372,9 @@ publishers: - lf-infra-publish - ta-publisher-ci-build: - arch: '{arch}' + arch: "{arch}" - trigger-parameterized-builds: - - project: 'ta-ci-build-{arch}' + - project: "ta-ci-build-{arch}" condition: UNSTABLE_OR_BETTER trigger-with-no-params: true diff --git a/jjb/akraino-templates/akraino-ta-common-templates.yaml b/jjb/akraino-templates/akraino-ta-common-templates.yaml index 4833947..351e02e 100644 --- a/jjb/akraino-templates/akraino-ta-common-templates.yaml +++ b/jjb/akraino-templates/akraino-ta-common-templates.yaml @@ -1,7 +1,7 @@ --- - job-template: id: akraino-project-stream-type-ta - name: '{project-name}-{stream}-{project-type}' + name: "{project-name}-{stream}-{project-type}" archive-artifacts: > work/**/*.spec work/**/*.repo @@ -17,63 +17,67 @@ stream: master project-type: freestyle submodule-recursive: true - node: '{build-node}' + node: "{build-node}" arch: amd64 gerrit-skip-vote: false + default-refspec: refs/heads/master properties: - lf-infra-properties: - project: '{project}' - build-days-to-keep: '{build-days-to-keep}' + project: "{project}" + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - lftools-version: '{lftools-version}' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + lftools-version: "{lftools-version}" - - ta-parameters-ci + - ta-parameters: + scm-refspec-manifest: "{default-refspec}" + scm-refspec-build-tools: "{default-refspec}" + scm-refspec-rpmbuilder: "{default-refspec}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" scm: - ta-lf-infra-gerrit-scm-{project-type}: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' - basedir: '$GERRIT_PROJECT' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" + basedir: "$GERRIT_PROJECT" triggers: - ta-trigger-job-{project-type}: - gerrit-server-name: '{gerrit-server-name}' - gerrit-skip-vote: '{gerrit-skip-vote}' - project: '{project}' - branch: '{branch}' + gerrit-server-name: "{gerrit-server-name}" + gerrit-skip-vote: "{gerrit-skip-vote}" + project: "{project}" + branch: "{branch}" builders: - ta-builder-install-docker - ta-builder-job-{project-type}: - git-url: '{git-url}' + git-url: "{git-url}" publishers: - ta-publisher-job-{project-type}: - arch: '{arch}' + arch: "{arch}" - job-template: id: akraino-project-stream-type-ta-rpmbuilder - name: '{project-name}-{stream}-{project-type}' + name: "{project-name}-{stream}-{project-type}" archive-artifacts: > work/**/*.spec work/**/*.repo @@ -89,61 +93,67 @@ stream: master project-type: freestyle submodule-recursive: true - node: '{build-node}' + node: "{build-node}" gerrit-skip-vote: false + default-refspec: refs/heads/master + project-to-build: "ta/yarf" properties: - lf-infra-properties: - project: '{project}' - build-days-to-keep: '{build-days-to-keep}' + project: "{project}" + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - lftools-version: '{lftools-version}' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + lftools-version: "{lftools-version}" - - ta-parameters-ci-{project} + - ta-parameters: + scm-refspec-manifest: "{default-refspec}" + scm-refspec-build-tools: "{default-refspec}" + scm-project-to-build-refspec: "{default-refspec}" + scm-project-to-build: "{project-to-build}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" scm: - ta-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' - choosing-strategy: 'gerrit' - basedir: '$GERRIT_PROJECT' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" + choosing-strategy: "gerrit" + basedir: "$GERRIT_PROJECT" triggers: - ta-trigger-job-{project-type}: - gerrit-server-name: '{gerrit-server-name}' - gerrit-skip-vote: '{gerrit-skip-vote}' - project: '{project}' - branch: '{branch}' + gerrit-server-name: "{gerrit-server-name}" + gerrit-skip-vote: "{gerrit-skip-vote}" + project: "{project}" + branch: "{branch}" builders: - ta-builder-job-{project-type}-{project}: - git-url: '{git-url}' + git-url: "{git-url}" publishers: - lf-infra-publish - job-template: id: akraino-project-stream-type-ta-build - name: '{project-name}-{stream}-{project-type}' + name: "{project-name}-{stream}-{project-type}" archive-artifacts: > work/**/*.spec work/**/*.repo @@ -159,48 +169,48 @@ stream: master project-type: freestyle submodule-recursive: true - node: '{build-node}' + node: "{build-node}" gerrit-skip-vote: false properties: - lf-infra-properties: - project: '{project}' - build-days-to-keep: '{build-days-to-keep}' + project: "{project}" + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - lftools-version: '{lftools-version}' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + lftools-version: "{lftools-version}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" scm: - ta-lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' - choosing-strategy: 'gerrit' - basedir: '$GERRIT_PROJECT' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" + choosing-strategy: "gerrit" + basedir: "$GERRIT_PROJECT" triggers: - ta-trigger-job-{project-type}: - gerrit-server-name: '{gerrit-server-name}' - gerrit-skip-vote: '{gerrit-skip-vote}' - project: '{project}' - branch: '{branch}' + gerrit-server-name: "{gerrit-server-name}" + gerrit-skip-vote: "{gerrit-skip-vote}" + project: "{project}" + branch: "{branch}" builders: - ta-builder-tox @@ -211,7 +221,7 @@ - job-template: id: akraino-project-release-ta-build - name: '{name}' + name: "{name}" archive-artifacts: > work/**/*.spec work/**/*.repo @@ -231,60 +241,62 @@ stream: master project-type: freestyle submodule-recursive: true - node: '{build-node}' + node: "{build-node}" + default-refspec: refs/heads/master properties: - lf-infra-properties: - project: '{project}' - build-days-to-keep: '{build-days-to-keep}' + project: "{project}" + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' - lftools-version: '{lftools-version}' + project: "{project}" + stream: "{stream}" + branch: "{branch}" + lftools-version: "{lftools-version}" - - ta-parameters-manifest - - ta-parameters-build-tools + - ta-parameters: + scm-refspec-manifest: "{default-refspec}" + scm-refspec-build-tools: "{default-refspec}" - string: name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' + default: "{archive-artifacts}" description: Artifacts to archive to the logs server. wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" triggers: - gerrit: - server-name: '{gerrit-server-name}' + server-name: "{gerrit-server-name}" trigger-on: - ref-updated-event projects: - - project-compare-type: 'ANT' - project-pattern: 'ta/manifest' + - project-compare-type: "ANT" + project-pattern: "ta/manifest" branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - - project-compare-type: 'ANT' - project-pattern: 'ta/build-tools' + - branch-compare-type: "ANT" + branch-pattern: "**/{branch}" + - project-compare-type: "ANT" + project-pattern: "ta/build-tools" branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' + - branch-compare-type: "ANT" + branch-pattern: "**/{branch}" builders: - lf-display-node-uuid - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/manifest' - ref: '$SCM_REFSPEC_MANIFEST' + git-url: "{git-url}" + project: "ta/manifest" + ref: "$SCM_REFSPEC_MANIFEST" - ta-builder-scm: - git-url: '{git-url}' - project: 'ta/build-tools' - ref: '$SCM_REFSPEC_BUILD_TOOLS' + git-url: "{git-url}" + project: "ta/build-tools" + ref: "$SCM_REFSPEC_BUILD_TOOLS" - ta-builder-install-docker - ta-builder-install-build-tools - shell: |2- @@ -294,4 +306,4 @@ publishers: - ta-publisher-ci-build: - arch: '{name}' + arch: "{name}" diff --git a/jjb/akraino-templates/akraino-usecase-macros.yaml b/jjb/akraino-templates/akraino-usecase-macros.yaml index f697f9c..3b86010 100644 --- a/jjb/akraino-templates/akraino-usecase-macros.yaml +++ b/jjb/akraino-templates/akraino-usecase-macros.yaml @@ -3,28 +3,28 @@ # PARAMETERS # ############## - parameter: - name: 'seba_on_arm-defaults' + name: "seba_on_arm-defaults" parameters: - string: name: PON_TYPE - default: 'ponsim' + default: "ponsim" ######################## # publisher macros ######################## - publisher: - name: 'seba_on_arm-install-publisher' + name: "seba_on_arm-install-publisher" publishers: - email: recipients: armband@enea.com - lf-infra-publish - publisher: - name: 'seba_on_arm-test-publisher' + name: "seba_on_arm-test-publisher" publishers: - seba_on_arm-install-publisher - robot: - output-path: 'results' - report-html: '**/report.html' - log-html: '**/log.html' - output-xml: '**/output.xml' + output-path: "results" + report-html: "**/report.html" + log-html: "**/log.html" + output-xml: "**/output.xml" diff --git a/jjb/akraino-templates/akraino-usecase-templates.yaml b/jjb/akraino-templates/akraino-usecase-templates.yaml index 2e245ea..91611a4 100644 --- a/jjb/akraino-templates/akraino-usecase-templates.yaml +++ b/jjb/akraino-templates/akraino-usecase-templates.yaml @@ -1,60 +1,59 @@ --- - job-template: &akraino-usecase-phase-rec id: akraino-usecase-phase-rec - name: 'rec-{slave_label}-{phase}-{usecase}-{job_frequency}-{stream}' + name: "rec-{slave_label}-{phase}-{usecase}-{job_frequency}-{stream}" concurrent: true - node: '{slave_label}' + node: "{slave_label}" # Support usecases that reside in a different project repo, e.g. # seba_on_arm usecase uses the 'iec' project git repo, even if this # job targets a different project, 'rec'. - usecase_project: 'iec' + usecase_project: "iec" properties: - throttle: enabled: true max-total: 4 max-per-node: 1 - option: 'project' + option: "project" - build-blocker: use-build-blocker: true blocking-jobs: - - '.*-{usecase}-.*' - block-level: 'NODE' + - ".*-{usecase}-.*" + block-level: "NODE" parameters: - lf-infra-parameters: - project: '{usecase_project}' - stream: '{stream}' - branch: '{branch}' - - '{project}-defaults' - - '{usecase}-defaults' + project: "{usecase_project}" + stream: "{stream}" + branch: "{branch}" + - "{project}-defaults" + - "{usecase}-defaults" scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}/{usecase_project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}/{usecase_project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" submodule-recursive: false - submodule-timeout: '{submodule-timeout}' + submodule-timeout: "{submodule-timeout}" submodule-disable: true choosing-strategy: default builders: - - shell: - !include-raw-escape: ../shell/{usecase}.sh + - shell: !include-raw-escape: ../shell/{usecase}.sh publishers: - - '{usecase}-{phase}-publisher' + - "{usecase}-{phase}-publisher" - job-template: <<: *akraino-usecase-phase-rec id: akraino-usecase-phase-iec - name: 'iec-{iecType}-{phase}-{usecase}-{installer}-{deploy_type}-{os}-daily-{stream}' + name: "iec-{iecType}-{phase}-{usecase}-{installer}-{deploy_type}-{os}-daily-{stream}" parameters: - lf-infra-parameters: - project: '{usecase_project}' - stream: '{stream}' - branch: '{branch}' - - '{project}-defaults' - - '{installer}-{os}-defaults' - - '{usecase}-defaults' + project: "{usecase_project}" + stream: "{stream}" + branch: "{branch}" + - "{project}-defaults" + - "{installer}-{os}-defaults" + - "{usecase}-defaults" diff --git a/jjb/akraino-templates/akraino-validation-macros.yaml b/jjb/akraino-templates/akraino-validation-macros.yaml index 68ad5c5..ed2d9b1 100644 --- a/jjb/akraino-templates/akraino-validation-macros.yaml +++ b/jjb/akraino-templates/akraino-validation-macros.yaml @@ -8,61 +8,49 @@ - lab_params - string: name: LAB_SILO - default: '' - description: 'Folder in nexus where the logs are pushed.' + default: "" + description: "Folder in nexus where the logs are pushed." - string: name: SETTINGS_FILE - default: '/home/jenkins/settings.xml' - description: 'Path to credentials file' + default: "/home/jenkins/settings.xml" + description: "Path to credentials file" - parameter: name: lab_params parameters: - string: name: CLUSTER_MASTER_IP - default: '' - description: 'IP address to connect to the cluster master' + default: "" + description: "IP address to connect to the cluster master" - string: name: CLUSTER_SSH_USER - default: '' - description: 'SSH username to connect to the cluster master ' + default: "" + description: "SSH username to connect to the cluster master " - string: name: CLUSTER_SSH_PASSWORD - default: '' - description: 'SSH password to connect to the cluster master' + default: "" + description: "SSH password to connect to the cluster master" - string: name: CLUSTER_SSH_KEY - default: '' - description: 'SSH key to connect to the cluster master' + default: "" + description: "SSH key to connect to the cluster master" - string: name: BLUEPRINT - default: '' - description: 'Blueprint used' + default: "" + description: "Blueprint used" - string: name: LAYER - default: '' - description: 'Layer' + default: "" + description: "Layer" - string: name: VERSION - default: '' - description: 'Version' + default: "" + description: "Version" - string: name: OPTIONAL - default: '' - description: 'If set to yes run optional tests' + default: "" + description: "If set to yes run optional tests" - string: name: PULL - default: 'false' - description: 'If set to yes pull docker images before run' - -############ -# SETTINGS # -############ -# settings for jobs run in multijob phases -- _docker-build-job-settings: &docker-build-job-settings - name: docker_build_job_settings - current-parameters: true - git-revision: false - node-parameters: false - kill-phase-on: FAILURE - abort-all-jobs: false + default: "false" + description: "If set to yes pull docker images before run" diff --git a/jjb/akraino-templates/akraino-validation-templates.yaml b/jjb/akraino-templates/akraino-validation-templates.yaml index cb74915..5efd2ac 100644 --- a/jjb/akraino-templates/akraino-validation-templates.yaml +++ b/jjb/akraino-templates/akraino-validation-templates.yaml @@ -1,45 +1,60 @@ --- +############ +# SETTINGS # +############ +# settings for jobs run in multijob phases +- _docker-build-job-settings: &docker-build-job-settings + name: docker_build_job_settings + current-parameters: true + git-revision: false + node-parameters: false + kill-phase-on: FAILURE + abort-all-jobs: false + +############# +# TEMPLATES # +############# - job-template: id: akraino-validation-docker-multiarch - name: 'validation-{stream}-docker' + name: "validation-{stream}-docker" project-type: multijob - disabled: '{obj:disabled}' - node: 'centos7-builder-2c-1g' + disabled: "{obj:disabled}" + node: "centos7-builder-2c-1g" build-timeout: 90 parameters: - lf-infra-parameters: &validation_lf_infra_parameters - project: '{project}' - branch: '{branch}' - stream: '{stream}' + project: "{project}" + branch: "{branch}" + stream: "{stream}" properties: - throttle: max-per-node: 1 - option: 'project' + option: "project" - build-blocker: use-build-blocker: true blocking-jobs: - - 'validation-docker-.*' - block-level: 'NODE' + - "validation-docker-.*" + block-level: "NODE" - triggers: '{obj:triggers}' + triggers: "{obj:triggers}" builders: - multijob: - name: 'build validation images' + name: "build validation images" execution-type: PARALLEL projects: - - name: 'validation-docker-build-amd64-{stream}' + - name: "validation-docker-build-amd64-{stream}" <<: *docker-build-job-settings - - name: 'validation-docker-build-arm64-{stream}' + - name: "validation-docker-build-arm64-{stream}" <<: *docker-build-job-settings - multijob: - name: 'publish validation manifests' + name: "publish validation manifests" condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'validation-docker-manifest-{stream}' + - name: "validation-docker-manifest-{stream}" <<: *docker-build-job-settings publishers: @@ -49,12 +64,11 @@ cristina.pauna@enea.com juha.kosonen@nokia.com - - job-template: id: akraino-validation-docker-specific-arch - name: 'validation-docker-build-{arch_tag}-{stream}' - disabled: '{obj:disabled}' - node: '{slave_label}' + name: "validation-docker-build-{arch_tag}-{stream}" + disabled: "{obj:disabled}" + node: "{slave_label}" build-timeout: 75 parameters: @@ -64,25 +78,25 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'validation-docker-build-.*' - block-level: 'NODE' + - "validation-docker-build-.*" + block-level: "NODE" scm: &validation_scm # lf-infra-gerrit-scm hardcodes branch specifier to refs/heads; while # lf-infra-github-scm does not, allowing us to pass a fully custom '{branch}' - lf-infra-github-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$STREAM' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$STREAM" submodule-recursive: false - submodule-timeout: '{submodule-timeout}' + submodule-timeout: "{submodule-timeout}" submodule-disable: false choosing-strategy: default builders: - lf-infra-docker-login: global-settings-file: global-settings - settings-file: '{mvn-settings}' + settings-file: "{mvn-settings}" - shell: | #!/bin/bash -ex if [ "{branch}" != "{stream}" ]; then export TAG_VER=$STREAM; fi @@ -94,21 +108,21 @@ - job-template: id: akraino-validation-docker-manifest - name: 'validation-docker-manifest-{stream}' - node: 'ubuntu1804-docker-8c-8g' + name: "validation-docker-manifest-{stream}" + node: "ubuntu1804-docker-8c-8g" build-timeout: 15 parameters: - lf-infra-parameters: *validation_lf_infra_parameters - disabled: '{obj:disabled}' + disabled: "{obj:disabled}" scm: *validation_scm builders: - lf-infra-docker-login: global-settings-file: global-settings - settings-file: '{mvn-settings}' + settings-file: "{mvn-settings}" - shell: | #!/bin/bash -ex if [ "{branch}" != "{stream}" ]; then export TAG_VER=$STREAM; fi @@ -119,16 +133,15 @@ - job-template: id: akraino-validation-lab-daily - name: 'validation-{validation_lab}-daily-{stream}' + name: "validation-{validation_lab}-daily-{stream}" concurrent: true - node: '{build-node}' + node: "{build-node}" parameters: - - {'lab_params'} + - lab_params builders: - trigger-builds: - - project: 'bluval-daily-{stream}' - predefined-parameters: - LAB_SILO={validation_lab} + - project: "bluval-daily-{stream}" + predefined-parameters: LAB_SILO={validation_lab} same-node: true current-parameters: true block: true @@ -138,24 +151,26 @@ - job-template: id: bluval-run-daily-tests - name: 'bluval-daily-{stream}' + name: "bluval-daily-{stream}" concurrent: true - node: '{build-node}' + node: "{build-node}" + lab-silo: "" parameters: - lf-infra-parameters: *validation_lf_infra_parameters - string: name: DEPLOY_SCENARIO - default: '' - - {'bluval-defaults'} + default: "" + - bluval-defaults: + lab-silo: "{lab-silo}" scm: - lf-infra-github-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - url: '{git-url}/{project}.git' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + url: "{git-url}/{project}.git" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" submodule-recursive: false - submodule-timeout: '{submodule-timeout}' + submodule-timeout: "{submodule-timeout}" submodule-disable: true choosing-strategy: default @@ -165,15 +180,15 @@ - lf-infra-create-netrc: server-id: logs - shell: !include-raw-escape: - - ../shell/run_bluval.sh + - ../shell/run_bluval.sh publishers: - lf-infra-publish - robot: - output-path: 'results' - report-html: '**/report.html' - log-html: '**/log.html' - output-xml: '**/output.xml' + output-path: "results" + report-html: "**/report.html" + log-html: "**/log.html" + output-xml: "**/output.xml" - logparser: use-project-rules: true parse-rules: "./bluval/rules.txt" diff --git a/jjb/camunda_workflow/camunda_workflow-docker.yaml b/jjb/camunda_workflow/camunda_workflow-docker.yaml index 31e4eb5..4e9dea6 100644 --- a/jjb/camunda_workflow/camunda_workflow-docker.yaml +++ b/jjb/camunda_workflow/camunda_workflow-docker.yaml @@ -23,12 +23,12 @@ stream: master java-version: openjdk8 mvn-version: mvn35 - mvn-opts: '' - mvn-params: '-f akraino' + mvn-opts: "" + mvn-params: "-f akraino" mvn-settings: camunda_workflow-settings build-timeout: 60 submodule-recursive: true branch: master jobs: - - 'akraino-project-stream-docker' - - 'akraino-project-stream-stage-docker' + - "akraino-project-stream-docker" + - "akraino-project-stream-stage-docker" diff --git a/jjb/camunda_workflow/camunda_workflow.yaml b/jjb/camunda_workflow/camunda_workflow.yaml index 0be9fa7..7a30a53 100644 --- a/jjb/camunda_workflow/camunda_workflow.yaml +++ b/jjb/camunda_workflow/camunda_workflow.yaml @@ -19,16 +19,16 @@ project: camunda_workflow project-name: camunda_workflow mvn-settings: camunda_workflow-settings - mvn-params: '-f akraino' - nexus-iq-namespace: 'akraino-' + mvn-params: "-f akraino" + nexus-iq-namespace: "akraino-" sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-api-token: "{sonarcloud_api_token}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" build-node: centos7-builder-2c-1g stream: master jobs: - - '{project-name}-maven-jobs' + - "{project-name}-maven-jobs" - gerrit-maven-sonar views: - project-view diff --git a/jjb/ci-management/ci-jobs.yaml b/jjb/ci-management/ci-jobs.yaml index e1ba32a..254e064 100644 --- a/jjb/ci-management/ci-jobs.yaml +++ b/jjb/ci-management/ci-jobs.yaml @@ -12,7 +12,7 @@ project: ci-management project-name: ci-management build-node: centos7-builder-2c-1g - jjb-version: 4.1.0 + jjb-version: 5.0.2 views: - project-view diff --git a/jjb/ci-management/static-slaves-ci-jobs.yaml b/jjb/ci-management/static-slaves-ci-jobs.yaml deleted file mode 100644 index 528d260..0000000 --- a/jjb/ci-management/static-slaves-ci-jobs.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- project: - name: static-slaves-ci-jobs - - project: ci-management - project-name: ci-management - branch: master - stream: '{branch}' - - build-node: - - aarch64_dev - - aarch64_build - - aarch64_baremetal - - aarch64_baremetal_dev - - jobs: - - akraino-project-build-node-init: - disable_job: false diff --git a/jjb/common-views.yaml b/jjb/common-views.yaml index c3b0e4b..c8f11bd 100644 --- a/jjb/common-views.yaml +++ b/jjb/common-views.yaml @@ -1,6 +1,6 @@ --- - view: - name: '00-Empty View' + name: "00-Empty View" description: > Empty job view. This is used as the default landing view to keep the Jenkins UI responding better while a) under high load and b) when there @@ -9,11 +9,11 @@ filter-executors: false filter-queue: false recurse: false - regex: '' + regex: "" - view: name: CLM - description: 'List of CLM jobs' + description: "List of CLM jobs" view-type: list filter-executors: false filter-queue: false @@ -27,4 +27,4 @@ - build-button - policy-violations recurse: false - regex: '.*-clm-.*' + regex: ".*-clm-.*" diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index c2d392a..a2bc8ee 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -3,9 +3,9 @@ name: global gerrit-server-name: Primary - git-url: 'ssh://akraino-jobbuilder@gerrit.akraino.org:29418' + git-url: "ssh://akraino-jobbuilder@gerrit.akraino.org:29418" jenkins-ssh-credential: jenkins-ssh - lftools-version: '<1.0.0' + lftools-version: "<1.0.0" submodule-timeout: 10 # Nexus 2 for jars diff --git a/jjb/icn/icn-daaas.yaml b/jjb/icn/icn-daaas.yaml index 6bbcbd3..48ae6c8 100644 --- a/jjb/icn/icn-daaas.yaml +++ b/jjb/icn/icn-daaas.yaml @@ -17,7 +17,7 @@ # - project: name: icn-daaas - project: 'icn/daaas' + project: "icn/daaas" project-name: icn-daaas build-node: ubuntu1804-helm-8c-32g stream: diff --git a/jjb/iec/iec-verify-jobs.yaml b/jjb/iec/iec-verify-jobs.yaml index fbc8e1b..46f36e1 100644 --- a/jjb/iec/iec-verify-jobs.yaml +++ b/jjb/iec/iec-verify-jobs.yaml @@ -3,17 +3,17 @@ project: iec project-name: iec name: iec-tox-verify - tox-envs: 'coala' + tox-envs: "coala" stream: - master: - branch: '{stream}' - gs-pathname: '' + branch: "{stream}" + gs-pathname: "" disabled: false jobs: - - 'gerrit-tox-verify': + - "gerrit-tox-verify": parallel: false submodule-disable: true parameters: - lf-infra-tox-parameters: - tox-envs: '{tox-envs}' + tox-envs: "{tox-envs}" build-node: centos7-builder-2c-1g diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml index 261dfd2..7d8118d 100644 --- a/jjb/iec/iec.yaml +++ b/jjb/iec/iec.yaml @@ -1,19 +1,19 @@ --- - project: - name: 'iec' - project-name: 'iec' - project: '{project-name}' + name: "iec" + project-name: "iec" + project: "{project-name}" views: - common-view: view-name: iec - view-regex: '^{project-name}-(sonar|(tox|type1|type2)-(verify|fuel|compass)-.*)' + view-regex: "^{project-name}-(sonar|(tox|type1|type2)-(verify|fuel|compass)-.*)" # ------------------------------- # BRANCH DEFINITIONS # ------------------------------- stream: - master: - branch: 'master' - gs-pathname: '' + branch: "master" + gs-pathname: "" disabled: false # ------------------------------- @@ -29,7 +29,7 @@ os: - ubuntu1804 - centos7 - #-------------------------------- + # ------------------------------- # IEC TYPE DEFINITINONS # type1 Mcbin embeded board # type2 Arm Server @@ -42,11 +42,11 @@ # ------------------------------- deploy_type: - baremetal: - slave_label: 'aarch64_baremetal_dev' - scenario: 'k8-calico-iec-noha' + slave_label: "aarch64_baremetal_dev" + scenario: "k8-calico-iec-noha" - virtual: - slave_label: 'aarch64_dev' - scenario: 'k8-calico-iec-noha' + slave_label: "aarch64_dev" + scenario: "k8-calico-iec-noha" exclude: # Compass does not run against baremetal PODs yet diff --git a/jjb/kni/kni_installer.yaml b/jjb/kni/kni_installer.yaml index 8ed4c7f..47169bc 100644 --- a/jjb/kni/kni_installer.yaml +++ b/jjb/kni/kni_installer.yaml @@ -1,7 +1,7 @@ --- - project: name: kni-installer - project: 'kni/installer' + project: "kni/installer" project-name: kni-installer stream: master branch: master @@ -10,7 +10,7 @@ - project: name: kni-blueprint-pae - project: 'kni/blueprint-pae' + project: "kni/blueprint-pae" project-name: blueprint-pae stream: master branch: master @@ -21,7 +21,7 @@ - project: name: kni-blueprint-basic-3-masters - project: 'kni/blueprint-basic-3-masters' + project: "kni/blueprint-basic-3-masters" project-name: blueprint-basic-3-masters stream: master branch: master @@ -32,7 +32,7 @@ - project: name: kni-blueprint-management-hub - project: 'kni/blueprint-management-hub' + project: "kni/blueprint-management-hub" project-name: blueprint-management-hub stream: master branch: master @@ -41,7 +41,7 @@ - project: name: kni-blueprint-ie - project: 'kni/blueprint-ie' + project: "kni/blueprint-ie" project-name: blueprint-ie stream: master branch: master diff --git a/jjb/nc/nc-ovs-dpdk-unicycle.yaml b/jjb/nc/nc-ovs-dpdk-unicycle.yaml index 10bbd2b..75f7bd5 100644 --- a/jjb/nc/nc-ovs-dpdk-unicycle.yaml +++ b/jjb/nc/nc-ovs-dpdk-unicycle.yaml @@ -14,4 +14,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/portal_user_interface/portal-onapsdk-docker.yaml b/jjb/portal_user_interface/portal-onapsdk-docker.yaml index 5e57fa3..459be14 100644 --- a/jjb/portal_user_interface/portal-onapsdk-docker.yaml +++ b/jjb/portal_user_interface/portal-onapsdk-docker.yaml @@ -16,19 +16,19 @@ # - project: project-name: portal_user_interface-portal-onapsdk - project: 'portal_user_interface/portal-onapsdk' + project: "portal_user_interface/portal-onapsdk" name: portal_user_interface-portal-onapsdk-docker global-settings-file: global-settings build-node: ubuntu1804-docker-8c-8g stream: master java-version: openjdk8 mvn-version: mvn35 - mvn-opts: '' - mvn-params: '' + mvn-opts: "" + mvn-params: "" mvn-settings: portal_user_interface-settings build-timeout: 60 submodule-recursive: true branch: master jobs: - - 'akraino-project-stream-docker' - - 'akraino-project-stream-stage-docker' + - "akraino-project-stream-docker" + - "akraino-project-stream-stage-docker" diff --git a/jjb/portal_user_interface/portal-onapsdk.yaml b/jjb/portal_user_interface/portal-onapsdk.yaml index 6be5b6d..1f66fcb 100644 --- a/jjb/portal_user_interface/portal-onapsdk.yaml +++ b/jjb/portal_user_interface/portal-onapsdk.yaml @@ -15,28 +15,28 @@ # limitations under the License. # - project: - project: 'portal_user_interface/portal-onapsdk' + project: "portal_user_interface/portal-onapsdk" project-name: portal_user_interface-portal-onapsdk name: portal_user_interface-portal-onapsdk build-node: centos7-builder-2c-1g mvn-settings: portal_user_interface-settings - mvn-params: '' - nexus-iq-namespace: 'akraino-' + mvn-params: "" + nexus-iq-namespace: "akraino-" sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_portal_user_interface' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-api-token: "{sonarcloud_api_token}" + sonarcloud-project-key: "{sonarcloud_project_organization}_portal_user_interface" stream: master jobs: - - 'gerrit-tox-verify': + - "gerrit-tox-verify": parallel: false submodule-disable: true stream: - master: - branch: '{stream}' - gs-pathname: '' + branch: "{stream}" + gs-pathname: "" disabled: false - - '{project-name}-maven-jobs' + - "{project-name}-maven-jobs" - gerrit-maven-sonar views: - project-view diff --git a/jjb/portal_user_interface/portal_user_interface-docker.yaml b/jjb/portal_user_interface/portal_user_interface-docker.yaml index 2f45d70..10c959f 100644 --- a/jjb/portal_user_interface/portal_user_interface-docker.yaml +++ b/jjb/portal_user_interface/portal_user_interface-docker.yaml @@ -23,12 +23,12 @@ stream: master java-version: openjdk8 mvn-version: mvn35 - mvn-opts: '' - mvn-params: '-f AECPortalMgmt' + mvn-opts: "" + mvn-params: "-f AECPortalMgmt" mvn-settings: portal_user_interface-settings build-timeout: 60 submodule-recursive: true branch: master jobs: - - 'akraino-project-stream-docker' - - 'akraino-project-stream-stage-docker' + - "akraino-project-stream-docker" + - "akraino-project-stream-stage-docker" diff --git a/jjb/portal_user_interface/portal_user_interface.yaml b/jjb/portal_user_interface/portal_user_interface.yaml index 76aa2b4..05f5120 100644 --- a/jjb/portal_user_interface/portal_user_interface.yaml +++ b/jjb/portal_user_interface/portal_user_interface.yaml @@ -19,16 +19,16 @@ project: portal_user_interface project-name: portal_user_interface mvn-settings: portal_user_interface-settings - mvn-params: '-f AECPortalMgmt' - nexus-iq-namespace: 'akraino-' + mvn-params: "-f AECPortalMgmt" + nexus-iq-namespace: "akraino-" sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-api-token: "{sonarcloud_api_token}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" build-node: centos7-builder-2c-1g stream: master jobs: - - '{project-name}-maven-jobs' + - "{project-name}-maven-jobs" - gerrit-maven-sonar views: - project-view diff --git a/jjb/postgres_db_schema/postgres_db_schema.yaml b/jjb/postgres_db_schema/postgres_db_schema.yaml index f32ee71..dfac4f8 100644 --- a/jjb/postgres_db_schema/postgres_db_schema.yaml +++ b/jjb/postgres_db_schema/postgres_db_schema.yaml @@ -23,14 +23,14 @@ stream: master java-version: openjdk8 mvn-version: mvn35 - mvn-opts: '' - mvn-params: '' + mvn-opts: "" + mvn-params: "" mvn-settings: postgres_db_schema-settings build-timeout: 60 submodule-recursive: true branch: master jobs: - - 'akraino-project-stream-docker' - - 'akraino-project-stream-stage-docker' + - "akraino-project-stream-docker" + - "akraino-project-stream-stage-docker" views: - project-view diff --git a/jjb/rec/rec.yaml b/jjb/rec/rec.yaml index 8a80b3b..0d8ef96 100644 --- a/jjb/rec/rec.yaml +++ b/jjb/rec/rec.yaml @@ -1,8 +1,8 @@ --- - project: - name: 'rec' - project-name: 'rec' - project: '{project-name}' + name: "rec" + project-name: "rec" + project: "{project-name}" views: - project-view # ------------------------------- diff --git a/jjb/redfish/redfish-docker.yaml b/jjb/redfish/redfish-docker.yaml index 66e2bc8..2977bcf 100644 --- a/jjb/redfish/redfish-docker.yaml +++ b/jjb/redfish/redfish-docker.yaml @@ -23,12 +23,12 @@ stream: master java-version: openjdk8 mvn-version: mvn35 - mvn-opts: '' - mvn-params: '' + mvn-opts: "" + mvn-params: "" mvn-settings: redfish-settings build-timeout: 60 submodule-recursive: true branch: master jobs: - - 'akraino-project-stream-docker' - - 'akraino-project-stream-stage-docker' + - "akraino-project-stream-docker" + - "akraino-project-stream-stage-docker" diff --git a/jjb/redfish/redfish.yaml b/jjb/redfish/redfish.yaml index de3517b..9e8e901 100644 --- a/jjb/redfish/redfish.yaml +++ b/jjb/redfish/redfish.yaml @@ -29,4 +29,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/regional_controller/api-server-docker.yaml b/jjb/regional_controller/api-server-docker.yaml index c171775..9e70f7a 100644 --- a/jjb/regional_controller/api-server-docker.yaml +++ b/jjb/regional_controller/api-server-docker.yaml @@ -16,19 +16,19 @@ # - project: name: regional_controller-api-server-docker - project: 'regional_controller/api-server' + project: "regional_controller/api-server" project-name: regional_controller-api-server global-settings-file: global-settings build-node: ubuntu1804-docker-8c-8g stream: master java-version: openjdk8 mvn-version: mvn35 - mvn-opts: '' - mvn-params: '' + mvn-opts: "" + mvn-params: "" mvn-settings: regional_controller-settings build-timeout: 60 submodule-recursive: true branch: master jobs: - - 'akraino-project-stream-docker' - - 'akraino-project-stream-stage-docker' + - "akraino-project-stream-docker" + - "akraino-project-stream-stage-docker" diff --git a/jjb/regional_controller/api-server.yaml b/jjb/regional_controller/api-server.yaml index 0b94da7..0455b2d 100644 --- a/jjb/regional_controller/api-server.yaml +++ b/jjb/regional_controller/api-server.yaml @@ -16,19 +16,19 @@ # - project: name: regional_controller-api-server - project: 'regional_controller/api-server' + project: "regional_controller/api-server" project-name: regional_controller-api-server mvn-settings: regional_controller-settings - mvn-params: '' - nexus-iq-namespace: 'akraino-' + mvn-params: "" + nexus-iq-namespace: "akraino-" sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_regional_controller' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-api-token: "{sonarcloud_api_token}" + sonarcloud-project-key: "{sonarcloud_project_organization}_regional_controller" build-node: centos7-builder-2c-1g stream: master jobs: - - '{project-name}-maven-jobs' + - "{project-name}-maven-jobs" - gerrit-maven-sonar views: - project-view diff --git a/jjb/regional_controller/regional_controller.yaml b/jjb/regional_controller/regional_controller.yaml index 7b0de5a..d7ab2dd 100644 --- a/jjb/regional_controller/regional_controller.yaml +++ b/jjb/regional_controller/regional_controller.yaml @@ -29,4 +29,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/sample_vnf/sample_vnf.yaml b/jjb/sample_vnf/sample_vnf.yaml index af3af50..40098de 100644 --- a/jjb/sample_vnf/sample_vnf.yaml +++ b/jjb/sample_vnf/sample_vnf.yaml @@ -29,4 +29,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/starlingx/starlingx.yaml b/jjb/starlingx/starlingx.yaml index 5ff534c..5b55da7 100644 --- a/jjb/starlingx/starlingx.yaml +++ b/jjb/starlingx/starlingx.yaml @@ -11,4 +11,4 @@ - akraino-project-stream-verify views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/test_automation/test_automation.yaml b/jjb/test_automation/test_automation.yaml index a84e8b2..1371d0a 100644 --- a/jjb/test_automation/test_automation.yaml +++ b/jjb/test_automation/test_automation.yaml @@ -29,4 +29,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/validation/bluval.yaml b/jjb/validation/bluval.yaml index e01b3bc..5b16a47 100644 --- a/jjb/validation/bluval.yaml +++ b/jjb/validation/bluval.yaml @@ -30,8 +30,8 @@ - rec stream: - master: - branch: '{stream}' - gs-pathname: '' + branch: "{stream}" + gs-pathname: "" disabled: false jobs: - bluval-run-daily-tests diff --git a/jjb/validation/lab.yaml b/jjb/validation/lab.yaml index c8e3d98..bf3abd2 100644 --- a/jjb/validation/lab.yaml +++ b/jjb/validation/lab.yaml @@ -22,8 +22,8 @@ build-node: centos7-builder-2c-1g stream: - master: - branch: '{stream}' - gs-pathname: '' + branch: "{stream}" + gs-pathname: "" disabled: false validation_lab: - enea diff --git a/jjb/validation/validation-docker.yaml b/jjb/validation/validation-docker.yaml index 7a99536..88fa8f8 100644 --- a/jjb/validation/validation-docker.yaml +++ b/jjb/validation/validation-docker.yaml @@ -1,41 +1,40 @@ --- - project: - name: validation-docker project: validation mvn-settings: validation-settings stream: - master: - branch: '{stream}' + branch: "{stream}" disabled: false triggers: # Build nigtly at 12:10 AM - - timed: '10 0 * * *' + - timed: "10 0 * * *" - 3.0.0: - branch: 'master' + branch: "master" disabled: false triggers: - gerrit: - server-name: '{gerrit-server-name}' + server-name: "{gerrit-server-name}" trigger-on: - change-merged-event - comment-added-contains-event: comment-contains-value: remerge$ projects: - project-compare-type: ANT - project-pattern: 'ci-management' + project-pattern: "ci-management" branches: - branch-compare-type: ANT - branch-pattern: '**/master' + branch-pattern: "**/master" file-paths: - compare-type: REG_EXP - pattern: 'jjb/validation/validation-docker.yaml' + pattern: "jjb/validation/validation-docker.yaml" arch_tag: - - 'amd64': - slave_label: 'ubuntu1804-docker-8c-8g' - - 'arm64': - slave_label: 'aarch64_build' + - "amd64": + slave_label: "ubuntu1804-docker-8c-8g" + - "arm64": + slave_label: "aarch64_build" jobs: - akraino-validation-docker-multiarch diff --git a/jjb/validation/validation-verify-jobs.yaml b/jjb/validation/validation-verify-jobs.yaml index 2d72cc8..d4a0010 100644 --- a/jjb/validation/validation-verify-jobs.yaml +++ b/jjb/validation/validation-verify-jobs.yaml @@ -5,11 +5,11 @@ name: validation-tox-verify stream: - master: - branch: '{stream}' - gs-pathname: '' + branch: "{stream}" + gs-pathname: "" disabled: false jobs: - - 'gerrit-tox-verify': + - "gerrit-tox-verify": parallel: false submodule-disable: true build-node: centos7-builder-2c-1g diff --git a/jjb/validation/validation.yaml b/jjb/validation/validation.yaml index 5ebf9b0..3d17a69 100644 --- a/jjb/validation/validation.yaml +++ b/jjb/validation/validation.yaml @@ -30,4 +30,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/jjb/yaml_builds/yaml_builds.yaml b/jjb/yaml_builds/yaml_builds.yaml index 723ed3f..4bcd725 100644 --- a/jjb/yaml_builds/yaml_builds.yaml +++ b/jjb/yaml_builds/yaml_builds.yaml @@ -29,4 +29,4 @@ - akraino-project-stream-stage-config views: - project-view - cron: '@weekly' # push fresh snapshot weekly + cron: "@weekly" # push fresh snapshot weekly diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml index 57bd951..2059b30 100644 --- a/packer/provision/helm.yaml +++ b/packer/provision/helm.yaml @@ -36,7 +36,7 @@ url: https://storage.googleapis.com/kubernetes-release/release/v{{kubectl_version}}/bin/linux/amd64/kubectl dest: /usr/local/bin/kubectl mode: 0775 - become: yes + become: true - name: "Install Helm {{helm_version}}" block: @@ -49,10 +49,10 @@ src: /tmp/helm-v{{helm_version}}-linux-amd64.tar.gz dest: /tmp remote_src: true - become: yes + become: true - name: "Move helm to /usr/local/bin and set as executable" command: "mv /tmp/linux-amd64/helm /usr/local/bin/helm" - become: yes + become: true - name: "Check helm." command: "which helm" - name: "Check kubectl."