Merge "oom-build: add missing parameters, rename to oom-helm-build"
diff --git a/jjb/airship/job_master_feature_tests_upgrade_centos.yml b/jjb/airship/job_master_feature_tests_upgrade_centos.yml
deleted file mode 100644
index 1ce9872..0000000
--- a/jjb/airship/job_master_feature_tests_upgrade_centos.yml
+++ /dev/null
@@ -1,108 +0,0 @@
----
-#
-# ============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: master_feature_tests_upgrade_centos
- name: '{job_prefix}_master_feature_tests_upgrade_centos'
- description: "Combined upgrade tests 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: ghprbTargetBranch
- default: 'master'
- description: 'Target branch of the PR'
- - string:
- name: DISTRIBUTION
- default: 'centos'
- description: 'Distribution to use for the tests.'
- - string:
- name: CAPI_VERSION
- default: 'v1alpha3'
- description: 'Cluster API version. Can be v1alpha3.'
- - string:
- name: CAPM3_VERSION
- default: 'v1alpha4'
- description: 'Cluster API provider Metal3 version. Can be v1alpha3 or v1alpha4.'
- - string:
- name: TARGET_NODE_OS
- default: 'Centos'
- description: 'Distribution to use for the target host.'
- - string:
- name: TARGET_NODE_MEMORY
- default: 4096
- description: 'RAM size of the target host.'
- - string:
- name: NUM_NODES
- default: 4
- description: 'Number of libvirt VMs.'
- - string:
- name: TESTS_FOR
- default: "feature_tests_upgrade_centos"
- description: 'Tests for combined upgrade.'
-
- properties:
- - build-discarder:
- days-to-keep: 30
- num-to-keep: 300
- artifact-days-to-keep: -1
- artifact-num-to-keep: -1
-
- triggers:
- - timed: "H H(21-23) * * *"
-
- pipeline-scm:
- scm:
- - git:
- url: "{ci_github_repo}"
- 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_github_pipeline}"
- lightweight-checkout: False
diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index bcc5e0e..e21ab2e 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -181,7 +181,6 @@
- master_feature_tests_ubuntu
- master_feature_tests_centos
- master_feature_tests_upgrade_ubuntu
- - master_feature_tests_upgrade_centos
repo:
org: "metal3-io"