From: Eric Ball <eball@linuxfoundation.org>
Date: Tue, 23 Jul 2019 17:03:19 +0000 (+0000)
Subject: Merge "[iec] view: Hide downstream projects"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=1eac22a1080099201d919b57dd6392ffae8cb1e9;hp=-c

Merge "[iec] view: Hide downstream projects"
---

1eac22a1080099201d919b57dd6392ffae8cb1e9
diff --combined jjb/iec/iec.yaml
index 6b3ac09,bf2f648..ad662cb
--- a/jjb/iec/iec.yaml
+++ b/jjb/iec/iec.yaml
@@@ -4,7 -4,9 +4,9 @@@
      project-name: 'iec'
      project: '{project-name}'
      views:
-       - project-view
+       - common-view:
+           view-name: iec
+           view-regex: '^{project-name}-(tox|fuel|compass)-.*'
      # -------------------------------
      # BRANCH DEFINITIONS
      # -------------------------------
@@@ -89,55 -91,33 +91,55 @@@
            name: ARCHIVE_ARTIFACTS
            default: '**/*.log'
            description: Artifacts to archive to the logs server.
 -- parameter:
 -    name: 'seba_on_arm-defaults'
 +# Usecase params are both installer and OS specific
 +- parameter: &k8s_fuel_ubuntu1604_parameter
 +    name: 'seba_on_arm-fuel-ubuntu1604-defaults'
      parameters:
 -      - string:
 +      - string: &k8s_master_ip
 +          name: K8S_MASTER_IP
 +          default: ''
 +          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 '
 -      - string:
 +      - string: &k8s_ssh_password
            name: K8S_SSH_PASSWORD
            default: ''
            description: 'SSH password to connect to the K8s master'
 -      - string:
 +      - string: &k8s_ssh_key
            name: K8S_SSH_KEY
            default: ''
            description: 'SSH key to connect to the K8s master'
 +- parameter:
 +    <<: *k8s_fuel_ubuntu1604_parameter
 +    name: 'seba_on_arm-fuel-ubuntu1804-defaults'
 +- parameter:
 +    name: 'seba_on_arm-fuel-centos7-defaults'
 +    parameters:
        - string:
 -          name: K8S_MASTER_IP_COMPASS
 +          <<: *k8s_master_ip
 +      - string:
 +          <<: *k8s_ssh_user
 +          default: 'centos'
 +      - string:
 +          <<: *k8s_ssh_password
 +      - string:
 +          <<: *k8s_ssh_key
 +- parameter:
 +    name: 'seba_on_arm-compass-ubuntu1604-defaults'
 +    parameters:
 +      - string:
 +          <<: *k8s_master_ip
            default: '10.1.0.50'
 -          description: 'IP address to compass connect to the K8s master'
        - string:
 -          name: K8S_SSH_PASSWORD_COMPASS
 +          <<: *k8s_ssh_user
            default: 'root'
 -          description: 'SSH password to compass connect to the K8s master'
        - string:
 -          name: K8S_SSH_USER_COMPASS
 +          <<: *k8s_ssh_password
            default: 'root'
 -          description: 'SSH username to compass connect to the K8s master'
 +      - string:
 +          <<: *k8s_ssh_key
  
  ########################
  # job templates
@@@ -323,7 -303,7 +325,7 @@@
            stream: '{stream}'
            branch: '{branch}'
        - '{project}-defaults'
 -      - '{usecase}-defaults'
 +      - '{usecase}-{installer}-{os}-defaults'
  
      wrappers:
        - build-name: