Delete select-mirror and all the args

It turns out that we pass a lot of args around simply for the purpose of doing mirror selection. This goes away if everything gets a mirror. This change should only be merged after the parent change has propagated to all puppeted slaves and updated nodepool images. Co-Authored-By: Jeremy Stanley <fungi@yuggoth.org> Change-Id: I4a721f6559d7160c8213268a8c1e35c667a67a4f
2014-06-27 23:37:48 -07:00 · 2014-06-27 23:37:48 -07:00 · 340ed93a18
commit 340ed93a18
parent 288452d062
24 changed files with 57 additions and 473 deletions
--- a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml
@ -11,8 +11,6 @@
      - gerrit-git-prep
      - tox:
          envlist: '{envlist}'
-          github-org: '{github-org}'
-          project: '{name}'

    publishers:
      - console-log
@ -30,8 +28,6 @@
      - gerrit-git-prep
      - tox:
          envlist: 'publishdocs-api'
-          github-org: 'openstack'
-          project: 'api-site'

    publishers:
      - console-log
--- a/modules/openstack_project/files/jenkins_job_builder/config/elastic-recheck.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/elastic-recheck.yaml
@ -5,9 +5,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - docs:
-          github-org: '{github-org}'
-          project: '{name}'
+      - docs

    publishers:
      - ftp:
--- a/modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml
@ -7,7 +7,6 @@
      - gerrit-git-prep
      - shell: |
          #!/bin/bash -xe
-          source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack-dev hacking
          tox -e integration {target-org} {target-project}

    publishers:
--- a/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml
@ -5,9 +5,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - selenium:
-          github-org: openstack
-          project: horizon
+      - selenium

    publishers:
      - console-log
@ -24,7 +22,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - shell: '/usr/local/jenkins/slave_scripts/run-unittests.sh 27dj14 openstack horizon'
+      - shell: '/usr/local/jenkins/slave_scripts/run-unittests.sh 27dj14'
      - assert-no-extra-files

    publishers:
--- a/modules/openstack_project/files/jenkins_job_builder/config/infra-publish-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/infra-publish-jobs.yaml
@ -5,9 +5,7 @@
    builders:
        - revoke-sudo
        - gerrit-git-prep
-        - docs:
-            github-org: '{github-org}'
-            project: '{name}'
+        - docs

    publishers:
        - console-log
--- a/modules/openstack_project/files/jenkins_job_builder/config/infra.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/infra.yaml
@ -5,7 +5,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - shell: "./tools/run-compare-xml.sh openstack-infra config"
+      - shell: ./tools/run-compare-xml.sh

    publishers:
      - console-log
@ -20,8 +20,6 @@
      - gerrit-git-prep
      - tox:
          envlist: 'irc'
-          github-org: 'openstack-infra'
-          project: 'config'

    publishers:
      - console-log
@ -35,8 +33,7 @@
      - revoke-sudo
      - gerrit-git-prep
      - shell: |
-          source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack-infra config
-          ./tools/run-layout.sh openstack-infra config
+          ./tools/run-layout.sh

    publishers:
      - console-log
@ -50,9 +47,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - docs:
-          github-org: openstack-infra
-          project: config
+      - docs

    publishers:
      - scp:
@ -71,9 +66,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - docs:
-          github-org: openstack-infra
-          project: config
+      - docs

    publishers:
      - console-log
@ -89,8 +82,6 @@
      - gerrit-git-prep
      - tox:
          envlist: projects_alphabetized
-          github-org: openstack-infra
-          project: config

    publishers:
      - console-log
@ -105,8 +96,6 @@
      - gerrit-git-prep
      - tox:
          envlist: upstream
-          github-org: openstack-infra
-          project: config

    publishers:
      - console-log
--- a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
@ -15,8 +15,6 @@
      - js-build:
          command: 'test'
          envlist: 'grunt'
-          github-org: '{github-org}'
-          project: '{name}'
      - assert-no-extra-files

    publishers:
@ -55,7 +53,6 @@
      - js-build:
          command: 'test:unit'
          envlist: 'grunt'
-          github-org: '{github-org}'
          project: '{name}'
      - assert-no-extra-files

@ -88,7 +85,6 @@
      - js-build:
          command: 'test:integration'
          envlist: 'grunt'
-          github-org: '{github-org}'
          project: '{name}'
      - assert-no-extra-files

@ -121,7 +117,6 @@
      - js-build:
          command: 'test:functional'
          envlist: 'grunt'
-          github-org: '{github-org}'
          project: '{name}'
      - assert-no-extra-files

@ -154,7 +149,6 @@
      - js-build:
          command: 'build'
          envlist: 'grunt'
-          github-org: '{github-org}'
          project: '{name}'
      - assert-no-extra-files

@ -188,8 +182,6 @@
      - js-build:
          command: 'build'
          envlist: 'grunt'
-          github-org: '{github-org}'
-          project: '{name}'
      - shell: |
          #!/bin/bash -xe
          /usr/local/jenkins/slave_scripts/version-properties.sh
--- a/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml
@ -6,9 +6,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - docs:
-          github-org: openstack-infra
-          project: jenkins-job-builder
+      - docs

    publishers:
      - scp:
@ -27,7 +25,6 @@
      - revoke-sudo
      - gerrit-git-prep
      - shell: |
-          source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack-infra jenkins-job-builder
          ./tools/run-compare-xml.sh

    publishers:
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@ -23,12 +23,12 @@
 - builder:
    name: coverage
    builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-cover.sh {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-cover.sh"

 - builder:
    name: docs
    builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-docs.sh {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-docs.sh"

 - builder:
    name: maven-test
@ -62,17 +62,17 @@
 - builder:
    name: bashate
    builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-bashate.sh {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-bashate.sh"

 - builder:
    name: pep8
    builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-pep8.sh {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-pep8.sh"

 - builder:
    name: pylint
    builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-pylint.sh {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-pylint.sh"

 - builder:
    name: npm-install
@ -171,47 +171,47 @@
 - builder:
    name: run-tests
    builders:
-      - shell: "./run-tests.sh {github-org} {project}"
+      - shell: "./run-tests.sh"

 - builder:
    name: selenium
    builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-selenium.sh {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-selenium.sh"

 - builder:
    name: js-build
    builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-jsbuild.sh {command} {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-jsbuild.sh {command}"

 - builder:
    name: python26
    builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 26 {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 26"

 - builder:
    name: python27
    builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 27 {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 27"

 - builder:
    name: python33
    builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 33 {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 33"

 - builder:
    name: python34
    builders:
-      - shell:  "/usr/local/jenkins/slave_scripts/run-unittests.sh 34 {github-org} {project}"
+      - shell:  "/usr/local/jenkins/slave_scripts/run-unittests.sh 34"

 - builder:
    name: pypy
    builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh py {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh py"

 - builder:
    name: tox
    builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh {envlist} {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh {envlist}"

 - builder:
    name: assert-no-extra-files
@ -233,8 +233,8 @@
    builders:
      - shell: |
          #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/run-tarball.sh {github-org} {project}
-          /usr/local/jenkins/slave_scripts/run-wheel.sh {github-org} {project}
+          /usr/local/jenkins/slave_scripts/run-tarball.sh
+          /usr/local/jenkins/slave_scripts/run-wheel.sh

 - builder:
    name: devstack-checkout
--- a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
@ -11,8 +11,6 @@
      - gerrit-git-prep
      - tox:
          envlist: '{envlist}'
-          github-org: '{github-org}'
-          project: '{name}'
      - assert-no-extra-files

    publishers:
--- a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
@ -15,9 +15,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - run-tests:
-          github-org: '{github-org}'
-          project: '{name}'
+      - run-tests

    publishers:
      - console-log
@ -30,9 +28,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - bashate:
-          github-org: '{github-org}'
-          project: '{name}'
+      - bashate

    publishers:
      - console-log
@ -45,7 +41,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - shell: '/usr/local/jenkins/slave_scripts/run-unittests.sh {env} {github-org} {name}'
+      - shell: '/usr/local/jenkins/slave_scripts/run-unittests.sh {env}'
      - assert-no-extra-files

    publishers:
--- a/modules/openstack_project/files/jenkins_job_builder/config/nodepool.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/nodepool.yaml
@ -6,9 +6,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - docs:
-          github-org: openstack-infra
-          project: nodepool
+      - docs

    publishers:
      - scp:
--- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml
@ -5,9 +5,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - docs:
-          github-org: '{github-org}'
-          project: '{name}'
+      - docs

    publishers:
      - ftp:
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
--- a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
@ -10,9 +10,7 @@
      - revoke-sudo
      - branch-git-prep:
          branch: '{branch}'
-      - python26:
-          github-org: '{github-org}'
-          project: '{name}'
+      - python26
      - assert-no-extra-files

    publishers:
@ -34,9 +32,7 @@
      - revoke-sudo
      - branch-git-prep:
          branch: '{branch}'
-      - python27:
-          github-org: '{github-org}'
-          project: '{name}'
+      - python27
      - assert-no-extra-files

    publishers:
@ -58,9 +54,7 @@
      - revoke-sudo
      - branch-git-prep:
          branch: '{branch}'
-      - docs:
-          github-org: '{github-org}'
-          project: '{name}'
+      - docs

    publishers:
      - console-log
--- a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml
@ -9,9 +9,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - coverage:
-          github-org: '{github-org}'
-          project: '{name}'
+      - coverage

    publishers:
      - coverage-log
@ -26,9 +24,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - pep8:
-          github-org: '{github-org}'
-          project: '{name}'
+      - pep8

    publishers:
      - console-log
@ -42,8 +38,6 @@
      - revoke-sudo
      - gerrit-git-prep
      - pep8:
-          github-org: '{github-org}'
-          project: '{name}'
      - zuul_swift_upload_logs_with_console:
          upload_source: '.tox/pep8/log'

@ -58,9 +52,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - pylint:
-          github-org: '{github-org}'
-          project: '{name}'
+      - pylint

    publishers:
      - console-log
@ -85,9 +77,7 @@
          rpm -ql libffi-devel
      - revoke-sudo
      - gerrit-git-prep
-      - python26:
-          github-org: '{github-org}'
-          project: '{name}'
+      - python26
      - assert-no-extra-files

    publishers:
@ -107,9 +97,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - python27:
-          github-org: '{github-org}'
-          project: '{name}'
+      - python27
      - assert-no-extra-files

    publishers:
@ -129,9 +117,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - python33:
-          github-org: '{github-org}'
-          project: '{name}'
+      - python33
      - assert-no-extra-files

    publishers:
@ -151,9 +137,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - python34:
-          github-org: '{github-org}'
-          project: '{name}'
+      - python34
      - assert-no-extra-files

    publishers:
@ -173,9 +157,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - pypy:
-          github-org: '{github-org}'
-          project: '{name}'
+      - pypy
      - assert-no-extra-files

    publishers:
@ -190,9 +172,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - docs:
-          github-org: '{github-org}'
-          project: '{name}'
+      - docs

    publishers:
      - console-log
@ -213,8 +193,6 @@
      - gerrit-git-prep
      - tox:
          envlist: '{envlist}'
-          github-org: '{github-org}'
-          project: '{name}'
      - assert-no-extra-files

    publishers:
@ -230,9 +208,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - tarball:
-          github-org: '{github-org}'
-          project: '{name}'
+      - tarball

    publishers:
      - tarball:
@ -251,9 +227,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - tarball:
-          github-org: '{github-org}'
-          project: '{name}'
+      - tarball
      - shell: |
          #!/bin/bash -xe
          BRANCH=$ZUUL_REFNAME
--- a/modules/openstack_project/files/jenkins_job_builder/config/specs-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/specs-jobs.yaml
@ -4,25 +4,24 @@
    name: '{name}-publish-specs'
    node: 'bare-precise || bare-trusty'

-    # We want to publish to {github-org}/{name} but the scp publisher
-    # cannot remove paths, so use a shell builder to move the content
-    # in the right place and publish from there.
+    # We want to publish to org/name but the scp publisher cannot remove paths,
+    # so use a shell builder to move the content in the right place and publish
+    # from there.
    builders:
      - revoke-sudo
      - gerrit-git-prep
      - docs:
-          github-org: '{github-org}'
          project: '{name}'
      - shell: |
-          mkdir {github-org}
-          mv doc/build/html {github-org}/{name}
+          mkdir `dirname $ZUUL_PROJECT`
+          mv doc/build/html $ZUUL_PROJECT

    publishers:
      - scp:
          site: 'static.openstack.org'
          files:
            - target: 'specs/'
-              source: '{github-org}/{name}/**'
+              source: '$ZUUL_PROJECT/**'
              keep-hierarchy: true
              copy-after-failure: false
      - console-log
--- a/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml
@ -6,9 +6,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - docs:
-          github-org: openstack-infra
-          project: storyboard
+      - docs

    publishers:
      - scp:
--- a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml
@ -22,7 +22,7 @@
          branch: master
      - shell: |
          #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/propose_translation_update.sh {github-org} {name}
+          /usr/local/jenkins/slave_scripts/propose_translation_update.sh {name}

    publishers:
      - console-log
--- a/modules/openstack_project/files/jenkins_job_builder/config/tuskar-ui.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/tuskar-ui.yaml
@ -5,9 +5,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - selenium:
-          github-org: openstack
-          project: tuskar-ui
+      - selenium

    publishers:
      - console-log
@ -21,8 +19,6 @@
      - gerrit-git-prep
      - tox:
          envlist: jshint
-          github-org: openstack
-          project: tuskar-ui

    publishers:
      - console-log
--- a/modules/openstack_project/files/jenkins_job_builder/config/vinz.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/vinz.yaml
@ -6,9 +6,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - docs:
-          github-org: openstack-infra
-          project: vinz
+      - docs

    publishers:
      - scp:
--- a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
@ -6,9 +6,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - docs:
-          github-org: openstack-infra
-          project: zuul
+      - docs

    publishers:
      - scp:
@ -26,9 +24,7 @@
    builders:
      - revoke-sudo
      - gerrit-git-prep
-      - coverage:
-          github-org: openstack-infra
-          project: zuul
+      - coverage

    publishers:
      - coverage-log
@ -46,9 +42,7 @@
      - revoke-sudo
      - branch-git-prep:
          branch: master
-      - python27:
-          github-org: 'openstack-infra'
-          project: 'zuul'
+      - python27

    publishers:
      - test-results
--- a/tools/run-compare-xml.sh
+++ b/tools/run-compare-xml.sh
@ -16,20 +16,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.

-org=$1
-project=$2
-
-if [[ -z "$org" || -z "$project" ]]
-then
-  echo "Usage: $0 ORG PROJECT"
-  echo
-  echo "ORG: The project organization (eg 'openstack')"
-  echo "PROJECT: The project name (eg 'nova')"
-  #TODO: make fatal in subsequent change: exit 1
-else
-  /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
-fi
-
 rm -fr .test
 mkdir .test
 cd .test
--- a/tools/run-layout.sh
+++ b/tools/run-layout.sh
@ -14,26 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.

-org=$1
-project=$2
-
-if [[ -z "$org" || -z "$project" ]]
-then
-  echo "Usage: $0 ORG PROJECT"
-  echo
-  echo "ORG: The project organization (eg 'openstack')"
-  echo "PROJECT: The project name (eg 'nova')"
-  exit 1
-else
-  if [ -f /usr/local/jenkins/slave_scripts/select-mirror.sh ]
-  then
-      /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
-  else
-      echo "No mirror script /usr/local/jenkins/slave_scripts/select-mirror.sh,"
-      echo "assuming local environment is configured properly."
-  fi
-fi
-
 mkdir -p .test
 cd .test
 [ -d zuul ] || git clone https://review.openstack.org/p/openstack-infra/zuul --depth 1