diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2019-05-06 17:40:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-06 17:40:44 +0000 |
| commit | 87f9a452fc08dde2048a88e9c6c0618e870eb47c (patch) | |
| tree | 5fcc7f1e140b47e5fc4349d57a23aacf0f0e2615 | |
| parent | 3fbab73173be54dfa32dcb800c2d07e686d108f5 (diff) | |
| parent | e97ee6919f355470e84e6734321cff43f01347cf (diff) | |
Merge "Replace offline installer job to triger real review"
| -rwxr-xr-x | jjb/oom/include-yaml-check.sh | 14 | ||||
| -rw-r--r-- | jjb/oom/offline-installer-review-bootstrap.sh | 8 | ||||
| -rw-r--r-- | jjb/oom/offline-installer.yaml | 8 | ||||
| -rw-r--r-- | jjb/oom/oom-jobs.yaml | 4 |
4 files changed, 14 insertions, 20 deletions
diff --git a/jjb/oom/include-yaml-check.sh b/jjb/oom/include-yaml-check.sh deleted file mode 100755 index 27359e597..000000000 --- a/jjb/oom/include-yaml-check.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# setting-up bash flags -set -x -e -o pipefail - -# remove old ansible - current centos build minion -# is quite old and using incompatible ansible 2.4.x -sudo yum -y remove ansible -sudo pip install ansible ansible-lint - -# perform check -ansible --version -ansible-lint --version -ansible-lint ./ansible/site.yml -vvv diff --git a/jjb/oom/offline-installer-review-bootstrap.sh b/jjb/oom/offline-installer-review-bootstrap.sh new file mode 100644 index 000000000..f8454d206 --- /dev/null +++ b/jjb/oom/offline-installer-review-bootstrap.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# setting-up bash flags +set -x -e -o pipefail + +#Run review script +./offline-installer-review.sh + diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml index ca2f15fc9..7e462d283 100644 --- a/jjb/oom/offline-installer.yaml +++ b/jjb/oom/offline-installer.yaml @@ -2,13 +2,13 @@ - project: name: offline-installer project-name: 'offline-installer' - build-node: centos7-builder-2c-1g - offline_build_script: !include-raw-escape: include-yaml-check.sh + build-node: 'ubuntu1604-docker-8c-8g' + offline_review_bootstrap: !include-raw-escape: offline-installer-review-bootstrap.sh stream: - 'master': branch: 'master' jobs: - - '{project-name}-{stream}-yaml-lint': - build_script: '{offline_build_script}' + - '{project-name}-{stream}-review': + build_script: '{offline_review_bootstrap}' diff --git a/jjb/oom/oom-jobs.yaml b/jjb/oom/oom-jobs.yaml index 02eae3fe3..5f95f70b8 100644 --- a/jjb/oom/oom-jobs.yaml +++ b/jjb/oom/oom-jobs.yaml @@ -1,8 +1,8 @@ --- - job-template: - name: '{project-name}-{stream}-yaml-lint' + name: '{project-name}-{stream}-review' node: '{build-node}' - type: freestyle + project-type: freestyle build_script: '' pattern: '**' |