Add v1alpha2 integration ci job

Change-Id: Icb17c0a8da5cdbb43bcdf3ed0f951c1d5621f01d

diff --git a/jjb/airship/job_capi_bm_integration_tests_centos.yml b/jjb/airship/job_capi_bm_integration_tests_centos.yml
index b46c3fc42a64ee55dbe6d68b29d0d4002ddeaf2c..4c47d087cc6d93540d90357c0188d49c7ee5e18f 100644 (file)
--- a/jjb/airship/job_capi_bm_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_integration_tests_centos.yml
@@ -49,6 +49,10 @@
         name: DISTRIBUTION
         default: 'centos'
         description: 'Distribution to use for the tests. Can be ubuntu or centos'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1alpha1'
+        description: 'Cluster API version. Can be v1alpha1 or v1alpha2'
 
     properties:
     - build-discarder:
@@ -66,7 +70,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '/test-centos-integration'
+        trigger-phrase: '/test-v1a1-centos-integration'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: False

diff --git a/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
index a56a3d9cd92f8bf156a1d4cd6b1e081fe628c350..d527880e0214000a10ddcf27bea50f4a6a185648 100644 (file)
--- a/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
@@ -49,6 +49,10 @@
         name: DISTRIBUTION
         default: 'ubuntu'
         description: 'Distribution to use for the tests. Can be ubuntu or centos'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1alpha1'
+        description: 'Cluster API version. Can be v1alpha1 or v1alpha2'
 
     properties:
     - build-discarder:
@@ -66,7 +70,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '/test-integration'
+        trigger-phrase: '/test-v1a1-integration'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: False

diff --git a/jjb/airship/job_capi_bm_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_master_integration_tests_centos.yml
index 617e7bbb4a5befce36b2e1e187d5a1107369e8a2..c33acaad114be519be525afbcfeddfa8d50a68cf 100644 (file)
--- a/jjb/airship/job_capi_bm_master_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_master_integration_tests_centos.yml
@@ -53,6 +53,10 @@
         name: DISTRIBUTION
         default: 'centos'
         description: 'Distribution to use for the tests. Can be ubuntu or centos'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1alpha1'
+        description: 'Cluster API version. Can be v1alpha1 or v1alpha2'
 
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml
index 98159fc7527d25f4050e5fe95ce2d32de27289f0..dbb093676e4ae009401bbfc7ec922ad3bad326ef 100644 (file)
--- a/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml
@@ -53,6 +53,10 @@
         name: DISTRIBUTION
         default: 'ubuntu'
         description: 'Distribution to use for the tests. Can be ubuntu or centos'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1alpha1'
+        description: 'Cluster API version. Can be v1alpha1 or v1alpha2'
 
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml
new file mode 100644 (file)
index 0000000..6a0d6e7
--- /dev/null
+++ b/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml
@@ -0,0 +1,100 @@
+---
+#
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2019 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+# Description:
+# ============
+# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# This job can be triggered manually or through a Github pull request. It creates a
+# pipeline job. The pipeline scripts are maintained in Airship CI repository.
+
+- job-template:
+    id: capi_bm_v1a2_integration_tests_centos
+    name: '{job_prefix}_{name}_v1a2_integration_test_centos'
+    description: "K8s CAPI baremetal v1alpha2 integration tests for {repo[org]}/{repo[name]} on CentOS. "
+    project-type: pipeline
+    defaults: global
+    disabled: False
+    concurrent: True
+    parameters:
+    - string:
+        name: PROJECT_REPO_ORG
+        default: '{repo[org]}'
+        description: 'Project github repo org name'
+    - string:
+        name: PROJECT_REPO_NAME
+        default: '{repo[name]}'
+        description: 'Project github repo name'
+    - string:
+        name: ghprbActualCommit
+        default: 'master'
+        description: 'CI Repo branch for triggering manual build'
+    - string:
+        name: DISTRIBUTION
+        default: 'centos'
+        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1alpha2'
+        description: 'Cluster API version. Can be v1alpha1 or v1alpha2'
+
+    properties:
+    - build-discarder:
+        days-to-keep: 30
+        num-to-keep: 300
+        artifact-days-to-keep: -1
+        artifact-num-to-keep: -1
+    - github:
+        url: https://github.com/{repo[org]}/{repo[name]}
+
+    triggers:
+    - github-pull-request:
+        admin-list:
+          - '{ci_github_admin_user}'
+        org-list: "{ci_github_whitelist_org}"
+        cron: 'H/5 * * * *'
+        auth-id: "{ci_ghprb_auth_id}"
+        trigger-phrase: '/test-centos-integration'
+        skip-build-phrase: '/skip-test'
+        only-trigger-phrase: True
+        github-hooks: False
+        permit-all: False
+        auto-close-on-fail: False
+        allow-whitelist-orgs-as-admins: True
+        white-list-target-branches:
+          - master
+        status-context: "v1a2-integration-tests-centos"
+        success-status: "Passed"
+        failure-status: "Failed"
+        error-status: "Error"
+        cancel-builds-on-update: True
+    pipeline-scm:
+      scm:
+      - git:
+          url: https://github.com/{ci_github_repo}.git
+          credentials-id: "{ci_github_jenkins_credentials_id}"
+          branches:
+            - '{branch|master}'
+          name: 'origin'
+          refspec: '+refs/heads/*:refs/remotes/origin/*'
+          wipe-workspace: True
+          honor-refspec: True
+          shallow-clone: False
+      script-path: 'ci/jobs/capi_bm_integration_tests.pipeline'
+      lightweight-checkout: False

diff --git a/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml
new file mode 100644 (file)
index 0000000..f79ab1d
--- /dev/null
+++ b/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml
@@ -0,0 +1,100 @@
+---
+#
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2019 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+# Description:
+# ============
+# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# This job can be triggered manually or through a Github pull request. It creates a
+# pipeline job. The pipeline scripts are maintained in Airship CI repository.
+
+- job-template:
+    id: capi_bm_v1a2_integration_tests_ubuntu
+    name: '{job_prefix}_{name}_v1a2_integration_test_ubuntu'
+    description: "K8s CAPI baremetal v1alpha2 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
+    project-type: pipeline
+    defaults: global
+    disabled: False
+    concurrent: True
+    parameters:
+    - string:
+        name: PROJECT_REPO_ORG
+        default: '{repo[org]}'
+        description: 'Project github repo org name'
+    - string:
+        name: PROJECT_REPO_NAME
+        default: '{repo[name]}'
+        description: 'Project github repo name'
+    - string:
+        name: ghprbActualCommit
+        default: 'master'
+        description: 'CI Repo branch for triggering manual build'
+    - string:
+        name: DISTRIBUTION
+        default: 'ubuntu'
+        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1alpha2'
+        description: 'Cluster API version. Can be v1alpha1 or v1alpha2'
+
+    properties:
+    - build-discarder:
+        days-to-keep: 30
+        num-to-keep: 300
+        artifact-days-to-keep: -1
+        artifact-num-to-keep: -1
+    - github:
+        url: https://github.com/{repo[org]}/{repo[name]}
+
+    triggers:
+    - github-pull-request:
+        admin-list:
+          - '{ci_github_admin_user}'
+        org-list: "{ci_github_whitelist_org}"
+        cron: 'H/5 * * * *'
+        auth-id: "{ci_ghprb_auth_id}"
+        trigger-phrase: '/test-integration'
+        skip-build-phrase: '/skip-test'
+        only-trigger-phrase: True
+        github-hooks: False
+        permit-all: False
+        auto-close-on-fail: False
+        allow-whitelist-orgs-as-admins: True
+        white-list-target-branches:
+          - master
+        status-context: "v1a2-integration-tests-ubuntu"
+        success-status: "Passed"
+        failure-status: "Failed"
+        error-status: "Error"
+        cancel-builds-on-update: True
+    pipeline-scm:
+      scm:
+      - git:
+          url: https://github.com/{ci_github_repo}.git
+          credentials-id: "{ci_github_jenkins_credentials_id}"
+          branches:
+            - '{branch|master}'
+          name: 'origin'
+          refspec: '+refs/heads/*:refs/remotes/origin/*'
+          wipe-workspace: True
+          honor-refspec: True
+          shallow-clone: False
+      script-path: 'ci/jobs/capi_bm_integration_tests.pipeline'
+      lightweight-checkout: False

diff --git a/jjb/airship/job_capi_bm_v1a2_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_centos.yml
new file mode 100644 (file)
index 0000000..197f520
--- /dev/null
+++ b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_centos.yml
@@ -0,0 +1,84 @@
+---
+#
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2019 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+# Description:
+# ============
+# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# This job can be triggered manually or through a Github pull request. It creates a
+# pipeline job. The pipeline scripts are maintained in Airship CI repository.
+
+- job-template:
+    id: capi_bm_v1a2_master_integration_tests_centos
+    name: '{job_prefix}_v1a2_master_integration_test_centos'
+    description: "K8s CAPI baremetal v1alpha2 integration tests for {repo[org]}/{repo[name]} on CentOS. "
+    project-type: pipeline
+    defaults: global
+    disabled: False
+    concurrent: True
+    parameters:
+    - string:
+        name: PROJECT_REPO_ORG
+        default: '{repo[org]}'
+        description: 'Project github repo org name'
+    - string:
+        name: PROJECT_REPO_NAME
+        default: '{repo[name]}'
+        description: 'Project github repo name'
+    - string:
+        name: ghprbActualCommit
+        default: 'master'
+        description: 'CI Repo branch for triggering manual build'
+    - string:
+        name: ghprbAuthorRepoGitUrl
+        default: 'https://github.com/{repo[org]}/{repo[name]}.git'
+        description: 'CI Repo URL for triggering manual build'
+    - string:
+        name: DISTRIBUTION
+        default: 'centos'
+        description: 'Distribution to use for the tests.'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1alpha2'
+        description: 'Cluster API version. Can be v1alpha1 or v1alpha2'
+
+    properties:
+    - build-discarder:
+        days-to-keep: 30
+        num-to-keep: 300
+        artifact-days-to-keep: -1
+        artifact-num-to-keep: -1
+
+    triggers:
+      - timed: "@midnight"
+
+    pipeline-scm:
+      scm:
+      - git:
+          url: https://github.com/Nordix/airship-dev-tools.git
+          credentials-id: "{ci_github_jenkins_credentials_id}"
+          branches:
+            - '{branch|master}'
+          name: 'origin'
+          refspec: '+refs/heads/*:refs/remotes/origin/*'
+          wipe-workspace: True
+          honor-refspec: True
+          shallow-clone: False
+      script-path: 'ci/jobs/capi_bm_integration_tests.pipeline'
+      lightweight-checkout: False

diff --git a/jjb/airship/job_capi_bm_v1a2_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_ubuntu.yml
new file mode 100644 (file)
index 0000000..1317f68
--- /dev/null
+++ b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_ubuntu.yml
@@ -0,0 +1,84 @@
+---
+#
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2019 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+# Description:
+# ============
+# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# This job can be triggered manually or through a Github pull request. It creates a
+# pipeline job. The pipeline scripts are maintained in Airship CI repository.
+
+- job-template:
+    id: capi_bm_v1a2_master_integration_tests_ubuntu
+    name: '{job_prefix}_v1a2_master_integration_test_ubuntu'
+    description: "K8s CAPI baremetal v1alpha2 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
+    project-type: pipeline
+    defaults: global
+    disabled: False
+    concurrent: True
+    parameters:
+    - string:
+        name: PROJECT_REPO_ORG
+        default: '{repo[org]}'
+        description: 'Project github repo org name'
+    - string:
+        name: PROJECT_REPO_NAME
+        default: '{repo[name]}'
+        description: 'Project github repo name'
+    - string:
+        name: ghprbActualCommit
+        default: 'master'
+        description: 'CI Repo branch for triggering manual build'
+    - string:
+        name: ghprbAuthorRepoGitUrl
+        default: 'https://github.com/{repo[org]}/{repo[name]}.git'
+        description: 'CI Repo URL for triggering manual build'
+    - string:
+        name: DISTRIBUTION
+        default: 'ubuntu'
+        description: 'Distribution to use for the tests.'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1alpha2'
+        description: 'Cluster API version. Can be v1alpha1 or v1alpha2'
+
+    properties:
+    - build-discarder:
+        days-to-keep: 30
+        num-to-keep: 300
+        artifact-days-to-keep: -1
+        artifact-num-to-keep: -1
+
+    triggers:
+      - timed: "@midnight"
+
+    pipeline-scm:
+      scm:
+      - git:
+          url: https://github.com/Nordix/airship-dev-tools.git
+          credentials-id: "{ci_github_jenkins_credentials_id}"
+          branches:
+            - '{branch|master}'
+          name: 'origin'
+          refspec: '+refs/heads/*:refs/remotes/origin/*'
+          wipe-workspace: True
+          honor-refspec: True
+          shallow-clone: False
+      script-path: 'ci/jobs/capi_bm_integration_tests.pipeline'
+      lightweight-checkout: False

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index e6f2906225726a66bc25cd32bdf9f5f04cd6db72..5f487e91c9869a5eda35796fd368f4e53943e135 100644 (file)
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -45,6 +45,8 @@
     - capi_bm_integration_tests_ubuntu
     - capi_bm_integration_tests_centos
     - capi_bm_unit_tests
+    - capi_bm_v1a2_integration_tests_ubuntu
+    - capi_bm_v1a2_integration_tests_centos
     - linter_tests
     repo:
       org: "Nordix"
@@ -65,6 +67,8 @@
     jobs:
     - capi_bm_integration_tests_ubuntu
     - capi_bm_integration_tests_centos
+    - capi_bm_v1a2_integration_tests_ubuntu
+    - capi_bm_v1a2_integration_tests_centos
     - linter_tests
     repo:
       org: "Nordix"
@@ -76,6 +80,8 @@
     - capi_bm_integration_tests_ubuntu
     - capi_bm_integration_tests_centos
     - capi_bm_unit_tests
+    - capi_bm_v1a2_integration_tests_centos
+    - capi_bm_v1a2_integration_tests_ubuntu
     - linter_tests
     repo:
       org: "Nordix"
@@ -90,6 +96,9 @@
     jobs:
     - capi_bm_integration_tests_ubuntu
     - capi_bm_integration_tests_centos
+    - capi_bm_v1a2_integration_tests_centos
+    - capi_bm_v1a2_integration_tests_ubuntu
+
     repo:
       org: "metal3-io"
       name: "baremetal-operator"
@@ -106,6 +115,11 @@
     - capi_bm_integration_tests_centos
     - capi_bm_master_integration_tests_ubuntu
     - capi_bm_master_integration_tests_centos
+    - capi_bm_v1a2_integration_tests_centos
+    - capi_bm_v1a2_integration_tests_ubuntu
+    - capi_bm_v1a2_master_integration_tests_ubuntu
+    - capi_bm_v1a2_master_integration_tests_centos
+
     repo:
       org: "metal3-io"
       name: "metal3-dev-env"
@@ -119,6 +133,9 @@
     jobs:
     - capi_bm_integration_tests_ubuntu
     - capi_bm_integration_tests_centos
+    - capi_bm_v1a2_integration_tests_centos
+    - capi_bm_v1a2_integration_tests_ubuntu
+
     repo:
       org: "metal3-io"
       name: "cluster-api-provider-baremetal"