diff --git a/nodepool/elements/nodepool-base/finalise.d/89-unbound b/nodepool/elements/nodepool-base/finalise.d/89-unbound index 9fe3973354..99012252d9 100755 --- a/nodepool/elements/nodepool-base/finalise.d/89-unbound +++ b/nodepool/elements/nodepool-base/finalise.d/89-unbound @@ -28,7 +28,7 @@ set -e # forwarder setup is only relevant to the initial boot and some parts # of the integration-tests before configure-unbound role is used. # -# [1] http://git.openstack.org/cgit/openstack-infra/openstack-zuul-jobs/tree/roles/configure-unbound +# [1] http://git.openstack.org/cgit/opendev/base-jobs/tree/roles/configure-unbound # NODEPOOL_STATIC_NAMESERVER_V4=${NODEPOOL_STATIC_NAMESERVER_V4:-208.67.222.222} diff --git a/playbooks/base-test/post-logs-swift.yaml b/playbooks/base-test/post-logs-swift.yaml deleted file mode 100644 index 9e56961f10..0000000000 --- a/playbooks/base-test/post-logs-swift.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: localhost - roles: - - role: ara-report - - role: htmlify-logs - - role: upload-logs-swift - zuul_log_cloud_config: '{{ log_cloud_config }}' - zuul_log_partition: true - -- hosts: localhost - # NOTE(pabelanger): We ignore_errors for the following tasks as not to fail - # successful jobs. - ignore_errors: yes - roles: - - submit-logstash-jobs - - submit-subunit-jobs diff --git a/playbooks/base-test/post-logs.yaml b/playbooks/base-test/post-logs.yaml deleted file mode 100644 index fc5f7ff3ed..0000000000 --- a/playbooks/base-test/post-logs.yaml +++ /dev/null @@ -1,19 +0,0 @@ -- hosts: localhost - roles: - - role: add-fileserver - fileserver: "{{ site_logs_project_config }}" - - role: ara-report - -- hosts: "{{ site_logs_project_config.fqdn }}" - gather_facts: False - roles: - - role: test-upload-logs - zuul_log_url: "http://logs.openstack.org" - -- hosts: localhost - # NOTE(pabelanger): We ignore_errors for the following tasks as not to fail - # successful jobs. - ignore_errors: yes - roles: - - submit-logstash-jobs - - submit-subunit-jobs diff --git a/playbooks/base-test/post.yaml b/playbooks/base-test/post.yaml deleted file mode 100644 index 972cc189d6..0000000000 --- a/playbooks/base-test/post.yaml +++ /dev/null @@ -1,26 +0,0 @@ -- hosts: all - roles: - - fetch-output - - merge-output-to-logs - -- hosts: localhost - roles: - - role: add-fileserver - when: - - zuul_success | bool - - zuul.change is not defined - -- hosts: "{{ fileserver.fqdn }}" - gather_facts: False - roles: - - role: publish-artifacts-to-fileserver - when: - - zuul_success | bool - - zuul.change is not defined - -- hosts: all - # NOTE(pabelanger): We ignore_errors for the following tasks as not to fail - # successful jobs. - ignore_errors: yes - roles: - - remove-build-sshkey diff --git a/playbooks/base-test/pre.yaml b/playbooks/base-test/pre.yaml deleted file mode 100644 index c14dd1988c..0000000000 --- a/playbooks/base-test/pre.yaml +++ /dev/null @@ -1,45 +0,0 @@ -- hosts: localhost - roles: - - role: emit-job-header - zuul_log_url: "http://logs.openstack.org" - -- hosts: all - pre_tasks: - # NOTE(pabelanger): Until we hit the validate-host role, we have a minimal - # set of ansible variables collected by zuul-executor. This doesn't include - # network variables (ansible_default_ipv4 / ansible_default_ipv6) so gather - # these variables as they are important to the configure-unbound role. - - name: Gather network facts - setup: - gather_subset: 'network' - - roles: - - add-build-sshkey - - start-zuul-console - - ensure-output-dirs - - log-inventory - -- hosts: all - roles: - # NOTE(pabelanger): We run this role in its own play to ensure unbound is - # restarted before proceeding with any other role. This is because we use - # notify / handler to restart the unbound service. With ansible notify - # actions are triggered at the end of each block of tasks in a play. - - configure-unbound - -- hosts: all - roles: - - validate-host - - use-cached-repos - - test-mirror-workspace-git-repos - - mirror-info - - role: configure-mirrors - set_apt_mirrors_trusted: True - - role: fetch-zuul-cloner - destination: "/usr/zuul-env/bin/zuul-cloner" - repo_src_dir: "/home/zuul/src/git.openstack.org" - - pre_tasks: - - name: Check that regional mirror is online - uri: - url: "http://{{ zuul_site_mirror_fqdn }}" diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index bf08500709..5159bf9cf1 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -35,33 +35,6 @@ secrets: - site_logs_project_config -# NOTE(corvus): A short-term test job -- job: - name: base-test-swift - parent: null - description: | - A job to test storing logs in swift. Not for general use. - pre-run: playbooks/base-test/pre.yaml - post-run: - - playbooks/base-test/post-ssh.yaml - - playbooks/base-test/post-logs-swift.yaml - roles: - - zuul: openstack-infra/zuul-jobs - - zuul: openstack-infra/openstack-zuul-jobs - timeout: 1800 - post-timeout: 1800 - vars: - ara_report_type: html - ara_report_path: ara-report - ara_compress_html: false - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - secrets: - - name: log_cloud_config - secret: openstackinfra_vexxhost - # TODO(pabelanger): Look to see if we can delete once topic:zuul-minimal-jobs is # finished. - job: diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml index 589d29ea9a..ab2108ca23 100644 --- a/zuul.d/secrets.yaml +++ b/zuul.d/secrets.yaml @@ -648,31 +648,6 @@ 6bIAL2nmPu9IaD8b6oIPKQEdbrbQcI8KwsEOrqSD7LwRER5ofRaSYIlXOk5T92yROgTR8 agA0DJaFG18YWcAlg8YnmWz/D+LyFDUaZOfIpoE3rsXig38cp2xinxNYWucck0= -- secret: - name: openstackinfra_vexxhost - data: - profile: vexxhost - auth_type: password - auth: - # TODO(jeblair): remove after https://review.openstack.org/585780 - auth_url: "https://auth.vexxhost.net" - password: !encrypted/pkcs1-oaep - - pmblJa+8KO6FAi9MPPXoBO0L0zPu9y87Bv8q2uxjpRdA7O7hNfbMIH+bjYNahgynUPK9F - /MH/3dJBqfX9q36QAoJdYApc8uQ73wJfxzywpCdWSBCXxuKc039bOI7cly7aBNAGlsoU3 - W652SSSbWfgWoAqP7uOccJDFtFC2OIoDuxmDnASWJ07cQ8FFltpTWiuQPNrhxn2yXZVsf - acKVX06PXVmKfFbmo+j+WCPHibBGIXkXtcO8cjTAeTxsXOFkZkxvBkm5KcFKp/uIB4WPk - Sl/i70m9HY7wqGI+UtwmxbCYdSn8jUE0RqG3QT52dzm3zUOyV/00ZNfFyFs6rMGqtgDGF - IS0Ncm4bOg2oDS+HW02dkG1WFaXpcp2laMMGd2PNwRLFteSvDIShHs7EFXYF2KBqt9Isj - YwVk3aYINHQFznAxvwRWtqeREtF2Om9a6ptSwS2Z4DfRUKU+Z6oiCDuQgn6zZgMBqVAoc - PjbX0WYMhYekpb+rdgF06tbOgtgWdnRzGCh9SpjHYTm1aDM8hOaEImG2oOVYPjbIVlVxs - CVUc6gky+kGhrcCo3B9eVe3oCVlpx9tPOfvYacoeYTSh6shI+QB9WPclA6ItA5FBY3PMt - VmW2jrbuJtCdVgzJDxxVBdArj8lhf0orLwv3kj3k+kmDhgyJiX9fdq/H+5tyJQ= - username: 'openstackjenkins' - project_name: 'openstackjenkins' - project_domain_id: default - user_domain_id: default - region_name: ca-ymq-1 - - secret: name: openstackzuul_docker_login data: