Merge "Remove TARGET_NODE_OS variable"

[infra/cicd.git] / jjb / metal3 / job_metal3_dev_tools_integration_test_ubuntu.yml

diff --git a/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml b/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml
index ed244edc997a20f71c0f9c03ba72e5252adfb2f2..b280bb6734817ef6ebbc96eb278ae5c7ee33e730 100644 (file)
--- a/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml
+++ b/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml
@@ -28,7 +28,7 @@
 - job-template:
     id: metal3_dev_tools_integration_test_ubuntu
     name: 'metal3_dev_tools_integration_test_ubuntu'
-    description: "CAPM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
+    description: "CAPM3 v1beta1 metal3-dev-tools integration tests for {repo[org]}/{repo[name]} on Ubuntu."
     project-type: pipeline
     defaults: global
     disabled: False
@@ -57,7 +57,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -66,10 +66,6 @@
         name: CAPM3_VERSION
         default: 'v1beta1'
         description: 'Cluster API provider Metal3 version. Can be v1alpha5 or v1alpha4.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Ubuntu'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096
@@ -95,7 +91,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-integration-metal3-ubuntu(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-integration-metal3-dev-tools-ubuntu(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -104,7 +100,7 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
-        status-context: "test-integration-metal3-ubuntu"
+        status-context: "test-integration-metal3-dev-tools-ubuntu"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"