From 83b5540c4fd089bd1baceef3044ca97177fa3c1b Mon Sep 17 00:00:00 2001 From: Denis Egorenko Date: Fri, 17 Apr 2015 14:25:07 +0300 Subject: [PATCH] Zuul and JJB improvements * remove UI jobs and triggers; * remove UI images from Nodepool; * remove fedora jobs for Vanilla 1 & 2.6; * remove unneded jjb config templates; * put all Sahara CI Infra jobs in one config; Change-Id: I3068f4ff18ccf6690d6504adff90de250e599eff --- config/nodepool/sahara.yaml | 10 - config/zuul/layout.yaml | 17 -- jenkins_job_builder/ci-infra.yaml | 121 ++++++++++++ jenkins_job_builder/devstack-gate.yaml | 101 ---------- jenkins_job_builder/jobs-updater.yaml | 24 --- jenkins_job_builder/macros.yaml | 231 ----------------------- jenkins_job_builder/misc.yaml | 41 ---- jenkins_job_builder/projects.yaml | 40 ---- jenkins_job_builder/python-jobs.yaml | 190 ------------------- jenkins_job_builder/sahara-ci-check.yaml | 17 -- jenkins_job_builder/sahara-ui.yaml | 43 ----- jenkins_job_builder/sahara.yaml | 30 --- jenkins_job_builder/update-config.yaml | 24 --- jenkins_job_builder/update-pool.yaml | 23 --- slave-scripts/gate-sahara.sh | 1 - 15 files changed, 121 insertions(+), 792 deletions(-) create mode 100644 jenkins_job_builder/ci-infra.yaml delete mode 100644 jenkins_job_builder/devstack-gate.yaml delete mode 100644 jenkins_job_builder/jobs-updater.yaml delete mode 100644 jenkins_job_builder/misc.yaml delete mode 100644 jenkins_job_builder/projects.yaml delete mode 100644 jenkins_job_builder/python-jobs.yaml delete mode 100644 jenkins_job_builder/sahara-ci-check.yaml delete mode 100644 jenkins_job_builder/sahara-ui.yaml delete mode 100644 jenkins_job_builder/update-config.yaml delete mode 100644 jenkins_job_builder/update-pool.yaml diff --git a/config/nodepool/sahara.yaml b/config/nodepool/sahara.yaml index bc3e22a2..e5c29cd4 100644 --- a/config/nodepool/sahara.yaml +++ b/config/nodepool/sahara.yaml @@ -21,11 +21,6 @@ labels: min-ready: 3 providers: - name: cilab-2 - - name: ui-neutron - image: ui-neutron - min-ready: 0 - providers: - - name: cilab-1 providers: - name: cilab-1 @@ -44,11 +39,6 @@ providers: min-ram: 2048 private-key: '/etc/nodepool/id_dsa' setup: prepare_node.sh - - name: ui-neutron - base-image: 'ubuntu-12.04' - min-ram: 4096 - private-key: '/etc/nodepool/id_dsa' - setup: prepare_node_ui.sh - name: cilab-2 username: 'ci-user' password: 'nova' diff --git a/config/zuul/layout.yaml b/config/zuul/layout.yaml index ea47a313..72b21175 100644 --- a/config/zuul/layout.yaml +++ b/config/zuul/layout.yaml @@ -53,21 +53,11 @@ projects: - gate-sahara-pep8-trunk - tempest-saharaclient-tests - - name: openstack/sahara-dashboard - check: - - gate-uitests-tests - -# - name: openstack/horizon -# check: -# - gate-ui-tests - - name: openstack/sahara-image-elements check: - dib-neutron-direct-vanilla_1-ubuntu-aio - - dib-neutron-direct-vanilla_1-fedora-aio - dib-neutron-direct-vanilla_1-centos-aio - dib-neutron-heat-vanilla_2.6-ubuntu - - dib-neutron-heat-vanilla_2.6-fedora - dib-neutron-heat-vanilla_2.6-centos - dib-nova-direct-spark-aio - dib-nova-direct-hdp_1-aio @@ -76,10 +66,8 @@ projects: - dib-nova-direct-cdh-centos-aio post: - dib-neutron-direct-vanilla_1-ubuntu-aio - - dib-neutron-direct-vanilla_1-fedora-aio - dib-neutron-direct-vanilla_1-centos-aio - dib-neutron-heat-vanilla_2.6-ubuntu - - dib-neutron-heat-vanilla_2.6-fedora - dib-neutron-heat-vanilla_2.6-centos - dib-nova-direct-spark-aio - dib-nova-direct-hdp_1-aio @@ -107,8 +95,3 @@ jobs: - ^.*\.rst$ - name: gate-sahara-pep8-trunk voting: false -# - name: gate-ui-tests -# voting: false -# files: -# - '^openstack_dashboard/dashboards/project/data_processing.*$' -# - 'openstack_dashboard/api/sahara.py' diff --git a/jenkins_job_builder/ci-infra.yaml b/jenkins_job_builder/ci-infra.yaml new file mode 100644 index 00000000..26b59c4e --- /dev/null +++ b/jenkins_job_builder/ci-infra.yaml @@ -0,0 +1,121 @@ +- job: + name: integration-cleanup + project-type: freestyle + defaults: global + description: "This job is managed by Jenkins Job Builder, do not edit it through WebUI.\ + \n

Please use this repository to make changes: https://git.openstack.org/stackforge/sahara-ci-config\ + \n

This job destroys vms which were not deleted after integration tests" + disabled: false + node: 'master' + + parameters: + - string: + name: PREV_BUILD + default: default + description: + - string: + name: PREV_JOB + default: + description: + - string: + name: HOST_NAME + default: + description: + + builders: + - shell: | + rm -rf sahara-ci-config + git clone https://git.openstack.org/stackforge/sahara-ci-config + bash $WORKSPACE/sahara-ci-config/slave-scripts/integration-cleanup.sh + +- job: + name: jobs-updater + node: master + project-type: freestyle + description: "This job is managed by Jenkins Job Builder, do not edit it through WebUI.\ + \n

Please use this repository to make changes: https://git.openstack.org/stackforge/sahara-ci-config\ + \n

Title: Jenkins Jobs Update job
\ + \nDescription: This job updates all other jobs from sahara-ci-config repo.
\ + \nMaintainer: Sergey Kolekonov
" + defaults: global + disabled: false + concurrent: false + + scm: + - git: + url: https://git.openstack.org/stackforge/sahara-ci-config + branches: + - "master" + + triggers: + - pollscm: "* * * * * " + + builders: + - shell: "jenkins-jobs update jenkins_job_builder" + +- job: + name: sahara-ci-syntax-check + project-type: freestyle + defaults: global + description: "This job is managed by Jenkins Job Builder, do not edit it through WebUI.\ + \n

Please use this repository to make changes: https://git.openstack.org/stackforge/sahara-ci-config\ + \n

This job check syntax in *.yaml, *.sh, *.py files" + disabled: false + concurrent: false + node: master + + builders: + - gerrit-git-prep + - shell: "bash /opt/ci/jenkins-jobs/sahara-ci-syntax-check.sh" + + publishers: + - console-log + +- job: + name: update-config + node: master + project-type: freestyle + description: "This job is managed by Jenkins Job Builder, do not edit it through WebUI.\ + \n

Please use this repository to make changes: https://git.openstack.org/stackforge/sahara-ci-config\ + \n

Title: Update job for Zuul and Nodepool
\ + \nDescription: This job updates Zuul and Nodepool configs from sahara-ci-config repo.
\ + \nMaintainer: Sergey Kolekonov
" + defaults: global + disabled: false + concurrent: false + + scm: + - git: + url: https://git.openstack.org/stackforge/sahara-ci-config + branches: + - "master" + + triggers: + - pollscm: "* * * * * " + + builders: + - shell: "$WORKSPACE/slave-scripts/update_config.sh" + +- job: + name: update-pool + node: master + project-type: freestyle + description: "This job is managed by Jenkins Job Builder, do not edit it through WebUI.\ + \n

Please use this repository to make changes: https://git.openstack.org/stackforge/sahara-ci-config\ + \n

Title: Update Pool
\ + \nDescription: This job updates vm pool using Nodepool.
\ + \nMaintainer: Sergey Kolekonov
" + defaults: global + disabled: false + concurrent: false + + properties: + - build-blocker: + blocking-jobs: + - ".*" + + triggers: + - timed: '0 6 * * *' + + builders: + - shell: "/opt/ci/jenkins-jobs/sahara-ci-config/slave-scripts/update_pool.sh" diff --git a/jenkins_job_builder/devstack-gate.yaml b/jenkins_job_builder/devstack-gate.yaml deleted file mode 100644 index c954333d..00000000 --- a/jenkins_job_builder/devstack-gate.yaml +++ /dev/null @@ -1,101 +0,0 @@ -- job-template: - name: '{pipeline}-tempest-dsvm-savanna-full{branch-designator}' - node: '{node}' - - wrappers: - - timeout: - timeout: 90 - fail: true - - timestamps - - builders: - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export DEVSTACK_GATE_SAVANNA=1 - export BRANCH_OVERRIDE={branch-override} - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - - link-logs - - publishers: - - devstack-logs - - console-log - - -- job-template: - name: '{pipeline}-tempest-dsvm-savanna-postgres-full{branch-designator}' - node: '{node}' - - wrappers: - - timeout: - timeout: 90 - fail: true - - timestamps - - builders: - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export DEVSTACK_GATE_POSTGRES=1 - export DEVSTACK_GATE_SAVANNA=1 - export BRANCH_OVERRIDE={branch-override} - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - - link-logs - - publishers: - - devstack-logs - - console-log - - -- job-template: - name: '{pipeline}-tempest-dsvm-savanna-neutron{branch-designator}' - node: '{node}' - - wrappers: - - timeout: - timeout: 120 - fail: true - - timestamps - - builders: - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_SMOKE_SERIAL=1 - export DEVSTACK_GATE_SAVANNA=1 - export BRANCH_OVERRIDE={branch-override} - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - - link-logs - - publishers: - - devstack-logs - - console-log - - -- job-group: - name: devstack-jobs - jobs: - - '{pipeline}-tempest-dsvm-savanna-full{branch-designator}' - - '{pipeline}-tempest-dsvm-savanna-postgres-full{branch-designator}' - - '{pipeline}-tempest-dsvm-savanna-neutron{branch-designator}' diff --git a/jenkins_job_builder/jobs-updater.yaml b/jenkins_job_builder/jobs-updater.yaml deleted file mode 100644 index a7e71a29..00000000 --- a/jenkins_job_builder/jobs-updater.yaml +++ /dev/null @@ -1,24 +0,0 @@ -- job: - name: jobs-updater - node: master - project-type: freestyle - description: "This job is managed by Jenkins Job Builder, do not edit it through WebUI.\ - \n

Please use this repository to make changes: https://git.openstack.org/stackforge/sahara-ci-config\ - \n

Title: Jenkins Jobs Update job
\ - \nDescription: This job updates all other jobs from sahara-ci-config repo.
\ - \nMaintainer: Sergey Kolekonov
" - defaults: global - disabled: false - concurrent: false - - scm: - - git: - url: https://git.openstack.org/stackforge/sahara-ci-config - branches: - - "master" - - triggers: - - pollscm: "* * * * * " - - builders: - - shell: "jenkins-jobs update jenkins_job_builder" diff --git a/jenkins_job_builder/macros.yaml b/jenkins_job_builder/macros.yaml index d5302b57..ef53e08b 100644 --- a/jenkins_job_builder/macros.yaml +++ b/jenkins_job_builder/macros.yaml @@ -3,157 +3,8 @@ builders: - shell: "/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org https://review.openstack.org" -- builder: - name: coverage - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-cover.sh {github-org} {project}" - -- builder: - name: docs - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-docs.sh {github-org} {project}" - -- builder: - name: bash8 - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-bash8.sh {github-org} {project}" - -- builder: - name: pep8 - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-pep8.sh {github-org} {project}" - -- builder: - name: pylint - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-pylint.sh {github-org} {project}" - -- builder: - name: run-tests - builders: - - shell: "./run-tests.sh {github-org} {project}" - -- builder: - name: selenium - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-selenium.sh {github-org} {project}" - -- builder: - name: python26 - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 26 {github-org} {project}" - -- builder: - name: python27 - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 27 {github-org} {project}" - -- builder: - name: python33 - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 33 {github-org} {project}" - -- builder: - name: pypy - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh py {github-org} {project}" - -- builder: - name: tox - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh {envlist} {github-org} {project}" - -- builder: - name: assert-no-extra-files - builders: - - shell: | - #!/bin/bash - OUT=`git ls-files --other --exclude-standard --directory` - if [ -z "$OUT" ]; then - echo "No extra files created during test." - exit 0 - else - echo "The following un-ignored files were created during the test:" - echo "$OUT" - exit 0 # TODO: change to 1 to fail tests. - fi - -- builder: - name: tarball - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-tarball.sh {github-org} {project}" - -- builder: - name: devstack-checkout - builders: - - shell: | - #!/bin/bash -xe - if [[ ! -e devstack-gate ]]; then - git clone git://git.openstack.org/openstack-infra/devstack-gate - else - cd devstack-gate - git remote set-url origin git://git.openstack.org/openstack-infra/devstack-gate - git remote update - git reset --hard - if ! git clean -x -f ; then - sleep 1 - git clean -x -f - fi - git checkout master - git reset --hard remotes/origin/master - if ! git clean -x -f ; then - sleep 1 - git clean -x -f - fi - cd .. - fi - -- builder: - name: experimental-devstack-checkout - builders: - - shell: | - #!/bin/bash -xe - if [[ ! -e devstack-gate ]]; then - git clone git://git.openstack.org/openstack-infra/devstack-gate - fi - cd devstack-gate - /usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org http://zuul.openstack.org git://git.openstack.org - cd .. - -- builder: - name: link-logs - builders: - - shell: | - #!/bin/sh - if test "$LOG_PATH" ; then - echo "Detailed logs: http://logs.openstack.org/$LOG_PATH/" - else - echo "Detailed logs: http://logs.openstack.org/periodic/$JOB_NAME/$NODE_NAME/$BUILD_NUMBER/" - fi - -- builder: - name: update-pypi-mirror - builders: - - shell: | - #!/bin/bash -xe - /usr/local/bin/run-mirror -c /home/jenkins/pypimirror/etc/pypi-mirror.yaml - find /home/jenkins/pypimirror/mirror/ \( -name index.html -or -name full.html \) -delete - rsync -a --ignore-existing --itemize-changes /home/jenkins/pypimirror/mirror/ jenkins@static.openstack.org:/srv/static/pypi/ - - # ====================================================================== -- publisher: - name: tarball - publishers: - - archive: - artifacts: 'dist/*.tar.gz' - - scp: - site: '{site}' - files: - - target: 'tarballs/{project}/' - source: 'dist/*.tar.gz' - - publisher: name: sahara-logs publishers: @@ -184,85 +35,3 @@ \nPREV_JOB=$JOB_NAME\ \nHOST_NAME=$NODE_NAME\ \nCLUSTER_HASH=$CLUSTER_HASH" - -- publisher: - name: console-log-periodic - publishers: - - scp: - site: 'localhost' - files: - - target: 'logs/periodic/$JOB_NAME/$NODE_NAME/$BUILD_NUMBER' - copy-console: true - copy-after-failure: true - -- publisher: - name: devstack-logs - publishers: - - scp: - site: 'localhost' - files: - - target: 'logs/$LOG_PATH' - source: 'logs/**' - keep-hierarchy: true - copy-after-failure: true - - target: 'logs/$LOG_PATH' - source: '**/testr_results.html.gz' - keep-hierarchy: false - copy-after-failure: true - - target: 'logs/$LOG_PATH' - source: '**/subunit_log.txt.gz' - keep-hierarchy: false - copy-after-failure: true - -- publisher: - name: devstack-logs-periodic - publishers: - - scp: - site: 'localhost' - files: - - target: 'logs/periodic/$JOB_NAME/$NODE_NAME/$BUILD_NUMBER' - source: 'logs/**' - keep-hierarchy: true - copy-after-failure: true - - target: 'logs/periodic/$JOB_NAME/$NODE_NAME/$BUILD_NUMBER' - source: '**/testr_results.html.gz' - keep-hierarchy: false - copy-after-failure: true - - target: 'logs/periodic/$JOB_NAME/$NODE_NAME/$BUILD_NUMBER' - source: '**/subunit_log.txt.gz' - keep-hierarchy: false - copy-after-failure: true - -- publisher: - name: coverage-log - publishers: - - scp: - site: 'localhost' - files: - - target: 'logs/$LOG_PATH' - source: 'cover/**' - keep-hierarchy: true - copy-after-failure: true - -- publisher: - name: test-results - publishers: - - scp: - site: 'localhost' - files: - - target: 'logs/$LOG_PATH' - source: '**/*nose_results.html' - keep-hierarchy: false - copy-after-failure: true - - target: 'logs/$LOG_PATH' - source: '**/*testr_results.html.gz' - keep-hierarchy: false - copy-after-failure: true - - target: 'logs/$LOG_PATH' - source: '.testrepository/tmp*' - keep-hierarchy: false - copy-after-failure: true - - target: 'logs/$LOG_PATH' - source: '**/*subunit_log.txt.gz' - keep-hierarchy: false - copy-after-failure: true diff --git a/jenkins_job_builder/misc.yaml b/jenkins_job_builder/misc.yaml deleted file mode 100644 index 1431a43d..00000000 --- a/jenkins_job_builder/misc.yaml +++ /dev/null @@ -1,41 +0,0 @@ -- job-template: - name: 'gate-{name}-run-tests' - - builders: - - gerrit-git-prep - - run-tests: - github-org: '{github-org}' - project: '{name}' - - publishers: - - console-log - - node: '{node}' - -- job-template: - name: 'gate-{name}-bash8' - - builders: - - gerrit-git-prep - - bash8: - github-org: '{github-org}' - project: '{name}' - - publishers: - - console-log - - node: '{node}' - -- job-template: - name: 'gate-{name}-unittests-{env}' - - builders: - - gerrit-git-prep - - shell: '/usr/local/jenkins/slave_scripts/run-unittests.sh {env} {github-org} {name}' - - assert-no-extra-files - - publishers: - - test-results - - console-log - - node: '{node}' diff --git a/jenkins_job_builder/projects.yaml b/jenkins_job_builder/projects.yaml deleted file mode 100644 index 7428b776..00000000 --- a/jenkins_job_builder/projects.yaml +++ /dev/null @@ -1,40 +0,0 @@ -#- project: -# name: savanna -# github-org: openstack -# node: precise -# -# jobs: -# - python-jobs -# - gate-{name}-pylint -# -#- project: -# name: python-savannaclient -# github-org: openstack -# node: precise -# -# jobs: -# - python-jobs -# -#- project: -# name: savanna-dashboard -# github-org: openstack -# node: precise -# -# jobs: -# - python-jobs -# -#- project: -# name: savanna-extra -# github-org: openstack -# node: precise -# -# jobs: -# - python-jobs -# -#- project: -# name: savanna-image-elements -# github-org: openstack -# node: precise -# -# jobs: -# - python-jobs diff --git a/jenkins_job_builder/python-jobs.yaml b/jenkins_job_builder/python-jobs.yaml deleted file mode 100644 index 3b0d1766..00000000 --- a/jenkins_job_builder/python-jobs.yaml +++ /dev/null @@ -1,190 +0,0 @@ -- job-template: - name: '{name}-coverage' - - wrappers: - - timeout: - timeout: 40 - fail: true - - timestamps - - builders: - - gerrit-git-prep - - coverage: - github-org: '{github-org}' - project: '{name}' - - publishers: - - coverage-log - - console-log - - node: '{node}' - - -- job-template: - name: 'gate-{name}-pep8' - - builders: - - gerrit-git-prep - - pep8: - github-org: '{github-org}' - project: '{name}' - - publishers: - - console-log - - node: '{node}' - - -- job-template: - name: 'gate-{name}-pylint' - - builders: - - gerrit-git-prep - - pylint: - github-org: '{github-org}' - project: '{name}' - - publishers: - - console-log - - node: '{node}' - - -- job-template: - name: 'gate-{name}-python26' - - wrappers: - - timeout: - timeout: 60 - fail: true - - timestamps - - builders: - - gerrit-git-prep - - python26: - github-org: '{github-org}' - project: '{name}' - - assert-no-extra-files - - publishers: - - test-results - - console-log - - node: centos6 - -- job-template: - name: 'gate-{name}-python27' - - wrappers: - - timeout: - timeout: 40 - fail: true - - timestamps - - builders: - - gerrit-git-prep - - python27: - github-org: '{github-org}' - project: '{name}' - - assert-no-extra-files - - publishers: - - test-results - - console-log - - node: '{node}' - -- job-template: - name: 'gate-{name}-python33' - - wrappers: - - timeout: - timeout: 40 - fail: true - - timestamps - - builders: - - gerrit-git-prep - - python33: - github-org: '{github-org}' - project: '{name}' - - assert-no-extra-files - - publishers: - - test-results - - console-log - - node: precisepy3k - -- job-template: - name: 'gate-{name}-pypy' - - wrappers: - - timeout: - timeout: 40 - fail: true - - timestamps - - builders: - - gerrit-git-prep - - pypy: - github-org: '{github-org}' - project: '{name}' - - assert-no-extra-files - - publishers: - - test-results - - console-log - - node: precisepy3k - -- job-template: - name: 'gate-{name}-tox-{envlist}' - - wrappers: - - timeout: - timeout: 40 - fail: true - - timestamps - - builders: - - gerrit-git-prep - - tox: - envlist: '{envlist}' - github-org: '{github-org}' - project: '{name}' - - assert-no-extra-files - - publishers: - - test-results - - console-log - - node: '{node}' - -- job-template: - name: 'gate-{name}-requirements' - node: precise - - builders: - - gerrit-git-prep - - shell: | - #!/bin/bash -xe - /usr/local/jenkins/slave_scripts/project-requirements-change.py $ZUUL_BRANCH - - publishers: - - console-log - - -- job-group: - name: python-jobs - jobs: - - '{name}-coverage' - - 'gate-{name}-pep8' - - 'gate-{name}-python26' - - 'gate-{name}-python27' - - 'gate-{name}-python33' - - 'gate-{name}-pypy' - - 'gate-{name}-requirements' - # pylint isn't standard - # gate-{name}-tox-{envlist} also isn't standard, but is reserved for - # projects that want to run specific jobs via tox diff --git a/jenkins_job_builder/sahara-ci-check.yaml b/jenkins_job_builder/sahara-ci-check.yaml deleted file mode 100644 index f906d1fb..00000000 --- a/jenkins_job_builder/sahara-ci-check.yaml +++ /dev/null @@ -1,17 +0,0 @@ -- job: - name: sahara-ci-syntax-check - project-type: freestyle - defaults: global - description: "This job is managed by Jenkins Job Builder, do not edit it through WebUI.\ - \n

Please use this repository to make changes: https://git.openstack.org/stackforge/sahara-ci-config\ - \n

This job check syntax in *.yaml, *.sh, *.py files" - disabled: false - concurrent: false - node: master - - builders: - - gerrit-git-prep - - shell: "bash /opt/ci/jenkins-jobs/sahara-ci-syntax-check.sh" - - publishers: - - console-log diff --git a/jenkins_job_builder/sahara-ui.yaml b/jenkins_job_builder/sahara-ui.yaml deleted file mode 100644 index 8b7f645e..00000000 --- a/jenkins_job_builder/sahara-ui.yaml +++ /dev/null @@ -1,43 +0,0 @@ -- job-template: - name: 'gate-{type}-tests' - project-type: freestyle - defaults: global - description: "This job is managed by Jenkins Job Builder, do not edit it through WebUI.\ - \n

Please use this repository to make changes: https://git.openstack.org/stackforge/sahara-ci-config\ - \n

Title: Tests for Sahara dashboard
\ - \nDescription: This job installs Sahara-dashboard and run selenium tests.
\ - \nMaintainer: Vadim Rovachev
" - node: ui-neutron - disabled: false - concurrent: false - - properties: - - zeromq-event - - builders: - - gerrit-git-prep - - shell: | - git clone https://git.openstack.org/stackforge/sahara-ci-config - FUNCTION_PATH=sahara-ci-config/slave-scripts ./sahara-ci-config/slave-scripts/gate-ui-tests.sh - - publishers: - - console-log - - workspace-cleanup: - dirmatch: true - fail-build: false - clean-if: - - success: true - - not-built: true - - unstable: true - - failure: true - - aborted: true - - trigger-cleanup - -- project: - name: sahara-dashboard - github-org: openstack - type: - - ui - - uitests - jobs: - - 'gate-{type}-tests' diff --git a/jenkins_job_builder/sahara.yaml b/jenkins_job_builder/sahara.yaml index b3a0cd86..ce1dba6c 100644 --- a/jenkins_job_builder/sahara.yaml +++ b/jenkins_job_builder/sahara.yaml @@ -122,36 +122,6 @@ - 'gate-saharaclient-neutron-{plugin-neutron}' - 'gate-saharaclient-nova-{plugin-nova_network}' -- job: - name: integration-cleanup - project-type: freestyle - defaults: global - description: "This job is managed by Jenkins Job Builder, do not edit it through WebUI.\ - \n

Please use this repository to make changes: https://git.openstack.org/stackforge/sahara-ci-config\ - \n

This job destroys vms which were not deleted after integration tests" - disabled: false - node: 'master' - - parameters: - - string: - name: PREV_BUILD - default: default - description: - - string: - name: PREV_JOB - default: - description: - - string: - name: HOST_NAME - default: - description: - - builders: - - shell: | - rm -rf sahara-ci-config - git clone https://git.openstack.org/stackforge/sahara-ci-config - bash $WORKSPACE/sahara-ci-config/slave-scripts/integration-cleanup.sh - - job: name: gate-sahara-pep8-trunk project-type: freestyle diff --git a/jenkins_job_builder/update-config.yaml b/jenkins_job_builder/update-config.yaml deleted file mode 100644 index 2a3177a5..00000000 --- a/jenkins_job_builder/update-config.yaml +++ /dev/null @@ -1,24 +0,0 @@ -- job: - name: update-config - node: master - project-type: freestyle - description: "This job is managed by Jenkins Job Builder, do not edit it through WebUI.\ - \n

Please use this repository to make changes: https://git.openstack.org/stackforge/sahara-ci-config\ - \n

Title: Update job for Zuul and Nodepool
\ - \nDescription: This job updates Zuul and Nodepool configs from sahara-ci-config repo.
\ - \nMaintainer: Sergey Kolekonov
" - defaults: global - disabled: false - concurrent: false - - scm: - - git: - url: https://git.openstack.org/stackforge/sahara-ci-config - branches: - - "master" - - triggers: - - pollscm: "* * * * * " - - builders: - - shell: "$WORKSPACE/slave-scripts/update_config.sh" diff --git a/jenkins_job_builder/update-pool.yaml b/jenkins_job_builder/update-pool.yaml deleted file mode 100644 index f7f01366..00000000 --- a/jenkins_job_builder/update-pool.yaml +++ /dev/null @@ -1,23 +0,0 @@ -- job: - name: update-pool - node: master - project-type: freestyle - description: "This job is managed by Jenkins Job Builder, do not edit it through WebUI.\ - \n

Please use this repository to make changes: https://git.openstack.org/stackforge/sahara-ci-config\ - \n

Title: Update Pool
\ - \nDescription: This job updates vm pool using Nodepool.
\ - \nMaintainer: Sergey Kolekonov
" - defaults: global - disabled: false - concurrent: false - - properties: - - build-blocker: - blocking-jobs: - - ".*" - - triggers: - - timed: '0 6 * * *' - - builders: - - shell: "/opt/ci/jenkins-jobs/sahara-ci-config/slave-scripts/update_pool.sh" diff --git a/slave-scripts/gate-sahara.sh b/slave-scripts/gate-sahara.sh index 7371bfd0..0fd39afc 100755 --- a/slave-scripts/gate-sahara.sh +++ b/slave-scripts/gate-sahara.sh @@ -65,7 +65,6 @@ case $job_type in insert_scenario_value $tests_config_file spark_image ;; esac -echo "$plugin detected" [ "$ZUUL_BRANCH" != "master" ] && sudo pip install -U -r requirements.txt sudo pip install .