Code Review
/
infra
/
cicd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
remove unusable ironic image parameters
[infra/cicd.git]
/
jjb
/
cloud-infra
/
onap-jobs
/
onap-verify-deploy-test.yaml
diff --git
a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
index 8ecf96e16366348a53cc53aa6a29f4c7f3d83410..5e8234f7eaa601ad0261a86a47e7f881bec6a28c 100644
(file)
--- a/
jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
+++ b/
jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
@@
-25,7
+25,7
@@
stream:
- 'master':
branch: '{stream}'
stream:
- 'master':
branch: '{stream}'
- k8s-version: '
1.15
'
+ k8s-version: '
master
'
deploy-scenario: 'onap-full-nofeature'
- 'guilin':
branch: '{stream}'
deploy-scenario: 'onap-full-nofeature'
- 'guilin':
branch: '{stream}'
@@
-49,7
+49,7
@@
unstable: false
notbuilt: false
- offline:
unstable: false
notbuilt: false
- offline:
- disabled:
fals
e
+ disabled:
tru
e
execution-mode: offline-deployment
successful: false
failed: false
execution-mode: offline-deployment
successful: false
failed: false
@@
-77,8
+77,8
@@
openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
# This should be
openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
# This should be
- dependency-jobs: 'onap-verify-
package-{distro}
-{stream}'
- dependency-job-var: 'TRIGGER_onap_verify_
package_{distro}
_{stream}_BUILD_RESULT'
+ dependency-jobs: 'onap-verify-
tox
-{stream}'
+ dependency-job-var: 'TRIGGER_onap_verify_
tox
_{stream}_BUILD_RESULT'
jobs:
- 'onap-verify-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}'
jobs:
- 'onap-verify-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}'
@@
-126,6
+126,10
@@
name: EXECUTION_MODE
default: '{execution-mode}'
description: 'Execution mode to run in'
name: EXECUTION_MODE
default: '{execution-mode}'
description: 'Execution mode to run in'
+ - string:
+ name: STACK_TYPE
+ default: 'onap'
+ description: 'Stack to package, deploy, test, release'
- string:
name: PDF
default: '{pdf}'
- string:
name: PDF
default: '{pdf}'
@@
-218,6
+222,9
@@
wrappers:
- build-timeout:
timeout: 600
wrappers:
- build-timeout:
timeout: 600
+ - ssh-agent-credentials:
+ users:
+ - 'nordixinfra-nordix-gerrit-ssh'
- credentials-binding:
- file:
credential-id: '{openrc-credentials-file}'
- credentials-binding:
- file:
credential-id: '{openrc-credentials-file}'
@@
-290,6
+297,7
@@
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: false
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: false
+ property-file: $WORKSPACE/change.properties
- name: 'onap-verify-{environment-type}-xtesting-healthcheck-{distro}-{cloud}-{type}-{stream}'
current-parameters: true
git-revision: true
- name: 'onap-verify-{environment-type}-xtesting-healthcheck-{distro}-{cloud}-{type}-{stream}'
current-parameters: true
git-revision: true
@@
-429,6
+437,7
@@
- fix-workspace-permissions
builders:
- fix-workspace-permissions
builders:
+ - 'download-xtesting-artifact-macro'
- 'xtesting-infra-healthcheck-macro'
- job-template:
- 'xtesting-infra-healthcheck-macro'
- job-template:
@@
-467,5
+476,6
@@
- fix-workspace-permissions
builders:
- fix-workspace-permissions
builders:
+ - 'wait-pkg-mgr-macro'
- 'xtesting-healthcheck-macro'
- 'xtesting-healthcheck-macro'