X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fiec%2Fiec.yaml;h=dc47acf288ad7d3cd357511e80faae489cc48431;hp=ad662cbf256716fe075a03fe1e928581d0e68fd5;hb=7cb83b7f5818727f5293fc02b96d5e5f065a78a1;hpb=3e56727601d0017599732254185a97e68cf9ee66 diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml index ad662cb..dc47acf 100644 --- a/jjb/iec/iec.yaml +++ b/jjb/iec/iec.yaml @@ -93,7 +93,7 @@ description: Artifacts to archive to the logs server. # Usecase params are both installer and OS specific - parameter: &k8s_fuel_ubuntu1604_parameter - name: 'seba_on_arm-fuel-ubuntu1604-defaults' + name: 'fuel-ubuntu1604-defaults' parameters: - string: &k8s_master_ip name: K8S_MASTER_IP @@ -113,9 +113,9 @@ description: 'SSH key to connect to the K8s master' - parameter: <<: *k8s_fuel_ubuntu1604_parameter - name: 'seba_on_arm-fuel-ubuntu1804-defaults' + name: 'fuel-ubuntu1804-defaults' - parameter: - name: 'seba_on_arm-fuel-centos7-defaults' + name: 'fuel-centos7-defaults' parameters: - string: <<: *k8s_master_ip @@ -127,7 +127,7 @@ - string: <<: *k8s_ssh_key - parameter: - name: 'seba_on_arm-compass-ubuntu1604-defaults' + name: 'compass-ubuntu1604-defaults' parameters: - string: <<: *k8s_master_ip @@ -175,6 +175,7 @@ stream: '{stream}' branch: '{branch}' - '{project}-defaults' + - '{installer}-{os}-defaults' - string: name: DEPLOY_SCENARIO default: '{scenario}' @@ -182,18 +183,27 @@ builders: - trigger-builds: - project: 'iec-deploy-{installer}-{deploy_type}-{os}-daily-{stream}' - current-parameters: false + current-parameters: true predefined-parameters: DEPLOY_SCENARIO={scenario} same-node: true block: true + - project: 'validation-enea-daily-{stream}' + same-node: true + current-parameters: true + predefined-parameters: | + BLUEPRINT={project-name} + LAYER=k8s + VERSION=master + OPTIONAL=yes + block: true - project: !j2: | {%- for uc in usecase -%} iec-install-{{ uc | first }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }} {%- if not loop.last -%},{%- endif -%} {%- endfor %} - current-parameters: false + current-parameters: true same-node: true block: true block-thresholds: @@ -325,7 +335,6 @@ stream: '{stream}' branch: '{branch}' - '{project}-defaults' - - '{usecase}-{installer}-{os}-defaults' wrappers: - build-name: