X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fonap-periodic-jobs%2Fonap-online-deploy-test-jobs.yaml;h=de635c353ce0e78eee1c37458d4c224c80031845;hb=refs%2Fchanges%2F34%2F4434%2F1;hp=e6514e6cd7c673167c0b775a8ac23dfcbd7bbf18;hpb=ec6b85f9fde82decec313ab0f0fef42b2a7e8602;p=infra%2Fcicd.git diff --git a/jjb/engine/onap-periodic-jobs/onap-online-deploy-test-jobs.yaml b/jjb/engine/onap-periodic-jobs/onap-online-deploy-test-jobs.yaml index e6514e6c..de635c35 100644 --- a/jjb/engine/onap-periodic-jobs/onap-online-deploy-test-jobs.yaml +++ b/jjb/engine/onap-periodic-jobs/onap-online-deploy-test-jobs.yaml @@ -76,21 +76,21 @@ job-phase: - deploy: build-timeout: 420 - - oom-hc: + - oom-healthcheck: build-timeout: 30 test-type: oom-healthcheck - - hc: + - healthcheck: build-timeout: 30 test-type: onap-healthcheck - promote: build-timeout: 240 jobs: - - '{deploy-scenario}-{onap-profile}-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}' - - 'onap-{onap-profile}-{job-phase}-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}' + - '{deploy-scenario}-{onap-profile}-{environment-type}-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}' + - 'onap-{onap-profile}-{environment-type}-{job-phase}-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}' - job-template: - name: '{deploy-scenario}-{onap-profile}-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}' + name: '{deploy-scenario}-{onap-profile}-{environment-type}-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}' project-type: multijob @@ -238,7 +238,7 @@ name: Deploy ONAP using OOM (not activated) condition: ALWAYS projects: - - name: 'onap-{environment-type}-deploy-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}' + - name: 'onap-{onap-profile}-{environment-type}-deploy-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | DISTRO=$DISTRO @@ -267,7 +267,7 @@ name: K8S and OOM Healthcheck using xtesting (not activated) condition: ALWAYS projects: - - name: 'onap-{onap-profile}-oom-hc-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}' + - name: 'onap-{onap-profile}-{environment-type}-oom-healthcheck-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | DISTRO=$DISTRO @@ -297,7 +297,7 @@ execution-type: SEQUENTIALLY condition: ALWAYS projects: - - name: 'onap-{onap-profile}-hc-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}' + - name: 'onap-{onap-profile}-{environment-type}-healthcheck-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL @@ -323,7 +323,7 @@ node-parameters: true kill-phase-on: NEVER abort-all-job: false - - name: 'onap-{environment-type}-{onap-profile}-healthdist-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}' + - name: 'onap-{onap-profile}-{environment-type}-healthdist-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL @@ -353,7 +353,7 @@ name: Promote ONAP (not activated) condition: ALWAYS projects: - - name: 'onap-{onap-profile}-promote-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}' + - name: 'onap-{onap-profile}-{environment-type}-promote-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL @@ -376,7 +376,7 @@ abort-all-job: false - job-template: - name: 'onap-{onap-profile}-{job-phase}-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}' + name: 'onap-{onap-profile}-{environment-type}-{job-phase}-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}' disabled: false