X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fiec%2Fiec.yaml;h=97ca88c1869110fd96f329cef26a5a46e7f6d90c;hb=88b2bd641a84773902abebe96319f3e4097c9e72;hp=ad662cbf256716fe075a03fe1e928581d0e68fd5;hpb=b70b689fda3e18967558b285629473b5ade679e7;p=ci-management.git diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml index ad662cb..97ca88c 100644 --- a/jjb/iec/iec.yaml +++ b/jjb/iec/iec.yaml @@ -93,11 +93,11 @@ 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 - default: '' + default: '172.16.10.36' description: 'IP address to connect to the K8s master' - string: &k8s_ssh_user name: K8S_SSH_USER @@ -109,13 +109,13 @@ description: 'SSH password to connect to the K8s master' - string: &k8s_ssh_key name: K8S_SSH_KEY - default: '' + default: '/var/lib/opnfv/mcp.rsa' 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: @@ -231,6 +241,7 @@ stream: '{stream}' branch: '{branch}' - '{project}-defaults' + - '{installer}-{os}-defaults' - string: name: DEPLOY_SCENARIO default: '{scenario}' @@ -295,6 +306,7 @@ stream: '{stream}' branch: '{branch}' - '{project}-defaults' + - '{installer}-{os}-defaults' - string: name: DEPLOY_SCENARIO default: '{scenario}' @@ -325,7 +337,7 @@ stream: '{stream}' branch: '{branch}' - '{project}-defaults' - - '{usecase}-{installer}-{os}-defaults' + - '{installer}-{os}-defaults' wrappers: - build-name: