diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-10-07 05:58:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-07 05:58:06 +0000 |
| commit | 59388f2c6a825f195fb9a1d939eacc6ef409f015 (patch) | |
| tree | cf26036e712c819920d4430884046c5a42dcd174 /jjb/fuel | |
| parent | d74e439e04434fd4e77e7c55e8ba4e25df3936a7 (diff) | |
| parent | 6574f2f12c6c9ed8b97e7727509f2ee21ccee1a4 (diff) | |
Merge "fuel: Specify upstream/opnfv branches separately and use include scripts"
Diffstat (limited to 'jjb/fuel')
| -rwxr-xr-x | jjb/fuel/fuel-plugin-build.sh | 10 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-plugin-test.sh | 10 | ||||
| -rw-r--r-- | jjb/fuel/fuel-plugin-verify-jobs.yml | 66 |
3 files changed, 57 insertions, 29 deletions
diff --git a/jjb/fuel/fuel-plugin-build.sh b/jjb/fuel/fuel-plugin-build.sh new file mode 100755 index 000000000..f7f613dc0 --- /dev/null +++ b/jjb/fuel/fuel-plugin-build.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then + JOB_TYPE=${BASH_REMATCH[0]} +else + echo "Unable to determine job type!" + exit 1 +fi + +echo "Not activated!" diff --git a/jjb/fuel/fuel-plugin-test.sh b/jjb/fuel/fuel-plugin-test.sh new file mode 100755 index 000000000..f7f613dc0 --- /dev/null +++ b/jjb/fuel/fuel-plugin-test.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then + JOB_TYPE=${BASH_REMATCH[0]} +else + echo "Unable to determine job type!" + exit 1 +fi + +echo "Not activated!" diff --git a/jjb/fuel/fuel-plugin-verify-jobs.yml b/jjb/fuel/fuel-plugin-verify-jobs.yml index cb2095575..4fea26b32 100644 --- a/jjb/fuel/fuel-plugin-verify-jobs.yml +++ b/jjb/fuel/fuel-plugin-verify-jobs.yml @@ -9,7 +9,8 @@ ##################################### stream: - master: - branch: '{stream}' + upstream-branch: '{stream}' + opnfv-branch: 'experimental' gs-pathname: '' disabled: false ##################################### @@ -44,6 +45,20 @@ max-total: 4 option: 'project' + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{upstream-branch}' + description: 'OpenStack branch to use' + - string: + name: OPNFV_BRANCH + default: '{opnfv-branch}' + description: 'OPNFV branch to use' + - 'opnfv-build-defaults' + - 'fuel-verify-plugin-defaults': + gs-pathname: '{gs-pathname}' + scm: - git: url: 'https://git.openstack.org/$GERRIT_PROJECT' @@ -87,7 +102,7 @@ project-pattern: 'openstack/fuel-plugin-bgpvpn' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' + branch-pattern: '**/{upstream-branch}' forbidden-file-paths: - compare-type: ANT pattern: 'README.md|.gitignore|.gitreview' @@ -95,21 +110,12 @@ project-pattern: 'openstack/fuel-plugin-onos' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' + branch-pattern: '**/{upstream-branch}' forbidden-file-paths: - compare-type: ANT pattern: 'README.md|.gitignore|.gitreview' readable-message: true - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - 'opnfv-build-defaults' - - 'fuel-verify-plugin-defaults': - gs-pathname: '{gs-pathname}' - builders: - description-setter: description: "Built on $NODE_NAME" @@ -162,6 +168,21 @@ - 'fuel-verify-plugin-test-.*' block-level: 'NODE' + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{upstream-branch}' + description: 'OpenStack branch to use' + - string: + name: OPNFV_BRANCH + default: '{opnfv-branch}' + description: 'OPNFV branch to use' + - '{slave-label}-defaults' + - '{installer}-defaults' + - 'fuel-verify-plugin-defaults': + gs-pathname: '{gs-pathname}' + scm: - git: url: 'https://git.openstack.org/$GERRIT_PROJECT' @@ -180,15 +201,6 @@ - timeout: timeout: 360 fail: true - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - '{slave-label}-defaults' - - '{installer}-defaults' - - 'fuel-verify-plugin-defaults': - gs-pathname: '{gs-pathname}' builders: - description-setter: @@ -200,18 +212,14 @@ - builder: name: 'fuel-verify-plugin-build-macro' builders: - - shell: | - #!/bin/bash - - echo "Not activated!" + - shell: + !include-raw: ./fuel-plugin-build.sh - builder: name: 'fuel-verify-plugin-test-macro' builders: - - shell: | - #!/bin/bash - - echo "Not activated!" + - shell: + !include-raw: ./fuel-plugin-test.sh ##################################### # parameter macros ##################################### |