From f2b51873a346fec4e1709c4bf3e60dff76431c12 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 2 Jul 2020 12:16:03 +0000 Subject: [PATCH] engine: Set deploy scenario and create k8s 1.16 jobs Change-Id: Ie53140f0bfda535820f44071dcde7e4bf1fb0833 --- .../verify-jobs/engine-verify-package.yaml | 5 +++++ .../verify-jobs/ironic-verify-deploy-test.yaml | 2 +- .../verify-jobs/ironic-verify-package.yaml | 5 +++++ .../kubernetes-verify-deploy-test.yaml | 7 +++++-- .../verify-jobs/kubernetes-verify-package.yaml | 17 +++++++++++++++++ .../verify-jobs/kubernetes-verify-tox.yaml | 3 +++ .../verify-jobs/onap-verify-deploy-test.yaml | 4 ++-- jjb/engine/verify-jobs/onap-verify-package.yaml | 7 +++++++ .../openstack-verify-deploy-test.yaml | 4 ++-- .../verify-jobs/openstack-verify-package.yaml | 7 +++++++ 10 files changed, 54 insertions(+), 7 deletions(-) diff --git a/jjb/engine/verify-jobs/engine-verify-package.yaml b/jjb/engine/verify-jobs/engine-verify-package.yaml index 5f4e80118..c29437667 100644 --- a/jjb/engine/verify-jobs/engine-verify-package.yaml +++ b/jjb/engine/verify-jobs/engine-verify-package.yaml @@ -32,6 +32,7 @@ failed: false unstable: false notbuilt: false + deploy-scenario: 'k8-calico-nofeature' distro: - ubuntu1804 @@ -50,6 +51,10 @@ concurrent: true parameters: + - string: + name: DEPLOY_SCENARIO + default: '{deploy-scenario}' + description: 'Scenario to test change with.' - string: name: EXECUTION_MODE default: '{execution-mode}' diff --git a/jjb/engine/verify-jobs/ironic-verify-deploy-test.yaml b/jjb/engine/verify-jobs/ironic-verify-deploy-test.yaml index 2ae78fe02..5a1051362 100644 --- a/jjb/engine/verify-jobs/ironic-verify-deploy-test.yaml +++ b/jjb/engine/verify-jobs/ironic-verify-deploy-test.yaml @@ -257,7 +257,7 @@ condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'ironic-verify-{environment-type}-deploy-{distro}-city-{type}-master' + - name: 'ironic-verify-{environment-type}-deploy-{distro}-city-{type}-{stream}' current-parameters: true git-revision: true node-parameters: true diff --git a/jjb/engine/verify-jobs/ironic-verify-package.yaml b/jjb/engine/verify-jobs/ironic-verify-package.yaml index 7835cf751..a43e1ec4a 100644 --- a/jjb/engine/verify-jobs/ironic-verify-package.yaml +++ b/jjb/engine/verify-jobs/ironic-verify-package.yaml @@ -32,6 +32,7 @@ failed: false unstable: false notbuilt: false + deploy-scenario: 'k8-calico-nofeature' distro: - ubuntu1804 @@ -52,6 +53,10 @@ concurrent: true parameters: + - string: + name: DEPLOY_SCENARIO + default: '{deploy-scenario}' + description: 'Scenario to test change with.' - string: name: EXECUTION_MODE default: '{execution-mode}' diff --git a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml index 4093ba5b9..cab7e12d2 100644 --- a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml +++ b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml @@ -32,6 +32,9 @@ - '1_17': branch: '1.17' deploy-scenario: 'k8-multus-plugins' + - '1_16': + branch: '1.16' + deploy-scenario: 'k8-calico-nofeature' - '1_15': branch: '1.15' deploy-scenario: 'k8-calico-nofeature' @@ -273,7 +276,7 @@ condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'kubernetes-verify-{environment-type}-deploy-{distro}-city-{type}-master' + - name: 'kubernetes-verify-{environment-type}-deploy-{distro}-city-{type}-{stream}' current-parameters: true git-revision: true node-parameters: true @@ -285,7 +288,7 @@ condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'kubernetes-verify-{environment-type}-functest-{distro}-city-{type}-master' + - name: 'kubernetes-verify-{environment-type}-functest-{distro}-city-{type}-{stream}' current-parameters: true git-revision: false node-parameters: true diff --git a/jjb/engine/verify-jobs/kubernetes-verify-package.yaml b/jjb/engine/verify-jobs/kubernetes-verify-package.yaml index 73a1e4d22..153776bd8 100644 --- a/jjb/engine/verify-jobs/kubernetes-verify-package.yaml +++ b/jjb/engine/verify-jobs/kubernetes-verify-package.yaml @@ -35,6 +35,7 @@ failed: false unstable: false notbuilt: false + deploy-scenario: 'k8-multus-plugins' - '1_17': branch: '1.17' openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd' @@ -44,6 +45,17 @@ failed: false unstable: false notbuilt: false + deploy-scenario: 'k8-multus-plugins' + - '1_16': + branch: '1.16' + openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd' + execution-mode: 'packaging' + gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray' + successful: false + failed: false + unstable: false + notbuilt: false + deploy-scenario: 'k8-calico-nofeature' - '1_15': branch: '1.15' openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd' @@ -53,6 +65,7 @@ failed: false unstable: false notbuilt: false + deploy-scenario: 'k8-calico-nofeature' distro: - ubuntu1804 @@ -71,6 +84,10 @@ concurrent: true parameters: + - string: + name: DEPLOY_SCENARIO + default: '{deploy-scenario}' + description: 'Scenario to test change with.' - string: name: EXECUTION_MODE default: '{execution-mode}' diff --git a/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml b/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml index e4c9875fe..0e64c81c7 100644 --- a/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml +++ b/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml @@ -32,6 +32,9 @@ - '1_17': branch: '1.17' gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray' + - '1_16': + branch: '1.16' + gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray' - '1_15': branch: '1.15' gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray' diff --git a/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml b/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml index cf3a3db02..c34477e04 100644 --- a/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml +++ b/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml @@ -264,7 +264,7 @@ condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'onap-verify-{environment-type}-deploy-{distro}-city-{type}-master' + - name: 'onap-verify-{environment-type}-deploy-{distro}-city-{type}-{stream}' current-parameters: true git-revision: true node-parameters: true @@ -276,7 +276,7 @@ condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'onap-verify-{environment-type}-functest-{distro}-city-{type}-master' + - name: 'onap-verify-{environment-type}-functest-{distro}-city-{type}-{stream}' current-parameters: true git-revision: false node-parameters: true diff --git a/jjb/engine/verify-jobs/onap-verify-package.yaml b/jjb/engine/verify-jobs/onap-verify-package.yaml index 1e5676246..5820b5fd3 100644 --- a/jjb/engine/verify-jobs/onap-verify-package.yaml +++ b/jjb/engine/verify-jobs/onap-verify-package.yaml @@ -32,6 +32,7 @@ failed: false unstable: false notbuilt: false + deploy-scenario: 'onap-sdc-full' - 'frankfurt': branch: '{stream}' openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd' @@ -41,6 +42,7 @@ failed: false unstable: false notbuilt: false + deploy-scenario: 'onap-sdc-full' - 'elalto': branch: '{stream}' openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd' @@ -50,6 +52,7 @@ failed: false unstable: false notbuilt: false + deploy-scenario: 'onap-sdc-full' distro: - ubuntu1804 @@ -68,6 +71,10 @@ concurrent: true parameters: + - string: + name: DEPLOY_SCENARIO + default: '{deploy-scenario}' + description: 'Scenario to test change with.' - string: name: EXECUTION_MODE default: '{execution-mode}' diff --git a/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml b/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml index 5125be3d7..5841d392f 100644 --- a/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml +++ b/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml @@ -264,7 +264,7 @@ condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'openstack-verify-{environment-type}-deploy-{distro}-city-{type}-master' + - name: 'openstack-verify-{environment-type}-deploy-{distro}-city-{type}-{stream}' current-parameters: true git-revision: true node-parameters: true @@ -276,7 +276,7 @@ condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'openstack-verify-{environment-type}-functest-{distro}-city-{type}-master' + - name: 'openstack-verify-{environment-type}-functest-{distro}-city-{type}-{stream}' current-parameters: true git-revision: false node-parameters: true diff --git a/jjb/engine/verify-jobs/openstack-verify-package.yaml b/jjb/engine/verify-jobs/openstack-verify-package.yaml index 3e1e59b7b..8efc2d797 100644 --- a/jjb/engine/verify-jobs/openstack-verify-package.yaml +++ b/jjb/engine/verify-jobs/openstack-verify-package.yaml @@ -32,6 +32,7 @@ failed: false unstable: false notbuilt: false + deploy-scenario: 'os-nosdn-nofeature' - 'train': branch: '{stream}' openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd' @@ -41,6 +42,7 @@ failed: false unstable: false notbuilt: false + deploy-scenario: 'os-nosdn-nofeature' - 'stein': branch: '{stream}' openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd' @@ -50,6 +52,7 @@ failed: false unstable: false notbuilt: false + deploy-scenario: 'os-nosdn-nofeature' distro: - ubuntu1804 @@ -68,6 +71,10 @@ concurrent: true parameters: + - string: + name: DEPLOY_SCENARIO + default: '{deploy-scenario}' + description: 'Scenario to test change with.' - string: name: EXECUTION_MODE default: '{execution-mode}' -- 2.25.1