Merge "Support password-based ssh auth"

diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index e632f1f..f0d234d 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -1,6 +1,6 @@
 # Cloud Configuration
 CLOUD_CREDENTIAL_ID=os-cloud
-CLOUD_URL=https://auth.vexxhost.net/v3/
+CLOUD_URL=https://auth.vexxhost.net/v3
 CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 

diff --git a/jjb/5g-mec-cloud-gaming/5g-mec-cloud-gaming.yaml b/jjb/5g-mec-cloud-gaming/5g-mec-cloud-gaming.yaml
new file mode 100644 (file)
index 0000000..ba84140
--- /dev/null
+++ b/jjb/5g-mec-cloud-gaming/5g-mec-cloud-gaming.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: 5g-mec-cloud-gaming-project-view
+    project-name: 5g-mec-cloud-gaming
+    views:
+      - project-view
+
+- project:
+    name: 5g-mec-cloud-gaming-info
+    project: 5g-mec-cloud-gaming
+    project-name: 5g-mec-cloud-gaming
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/akraino-templates/akraino-iec-macros.yaml b/jjb/akraino-templates/akraino-iec-macros.yaml
index 4bd825a..4db8f3a 100644 (file)
--- a/jjb/akraino-templates/akraino-iec-macros.yaml
+++ b/jjb/akraino-templates/akraino-iec-macros.yaml
@@ -87,6 +87,31 @@
           name: PON_TYPE
           default: 'ponsim'
 
+########################
+# publisher macros
+########################
+- publisher:
+    name: 'iec-default-publisher'
+    publishers:
+      - email:
+          recipients: armband@enea.com
+      - lf-infra-publish
+
+- publisher:
+    name: 'iec-install-usecase-publisher'
+    publishers:
+      - iec-default-publisher
+
+- publisher:
+    name: 'iec-test-usecase-publisher'
+    publishers:
+      - iec-default-publisher
+      - robot:
+          output-path: 'results'
+          report-html: '**/report.html'
+          log-html: '**/log.html'
+          output-xml: '**/output.xml'
+
 ########################
 # trigger macros
 ########################

diff --git a/jjb/akraino-templates/akraino-iec-templates.yaml b/jjb/akraino-templates/akraino-iec-templates.yaml
index 640923f..ec2d46e 100644 (file)
--- a/jjb/akraino-templates/akraino-iec-templates.yaml
+++ b/jjb/akraino-templates/akraino-iec-templates.yaml
@@ -79,7 +79,11 @@
               build-step-failure-threshold: 'never'
               failure-threshold: 'never'
               unstable-threshold: 'FAILURE'
-          - project: 'iec-{iecType}-destroy-{installer}-{deploy_type}-{os}-daily-{stream}'
+          - 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}
@@ -160,10 +164,8 @@
             - shell:
                 !include-raw-escape: ../iec/iec-fuel-deploy.sh
 
-    publishers: &publishers
-      - email:
-          recipients: armband@enea.com
-      - lf-infra-publish
+    publishers:
+      - iec-default-publisher
 
 - job-template:
     id: akraino-iec-destroy
@@ -197,7 +199,8 @@
       - shell:
           !include-raw-escape: ../iec/iec-{installer}-destroy.sh
 
-    publishers: *publishers
+    publishers:
+      - iec-default-publisher
 
 - job-template:
     id: akraino-iec-phase-usecase
@@ -225,4 +228,5 @@
       - shell:
           !include-raw-escape: ../iec/iec-{usecase}.sh
 
-    publishers: *publishers
+    publishers:
+      - 'iec-{phase}-usecase-publisher'

diff --git a/jjb/pcei/pcei.yaml b/jjb/pcei/pcei.yaml
new file mode 100644 (file)
index 0000000..2ac4138
--- /dev/null
+++ b/jjb/pcei/pcei.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: pcei-project-view
+    project-name: pcei
+    views:
+      - project-view
+
+- project:
+    name: pcei-info
+    project: pcei
+    project-name: pcei
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify