From 82e7504c36d09a665e66180dc4fba3f206d06493 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 14 May 2024 15:16:58 -0700 Subject: [PATCH] Retire devstack-gate This removes devstack-gate from the CI system and updates ACLS for the repo in Gerrit to the openstack retired repo config. There are also cleanups to nodepool elements and irc bots to remove references to devstack-gate where we don't need them anymore. Depends-On: https://review.opendev.org/c/openstack/governance/+/919629 Change-Id: I50ce4e5aa7001ba52bea78a65855278be68e61a5 --- gerrit/acls/openstack/devstack-gate.config | 18 ------------------ gerrit/projects.yaml | 6 ++---- gerritbot/channels.yaml | 2 -- nodepool/elements/README.rst | 8 ++++---- .../zuul-worker/install.d/60-zuul-worker | 2 +- tools/build-image.sh | 2 +- zuul.d/projects.yaml | 6 ------ zuul/main.yaml | 3 +-- 8 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 gerrit/acls/openstack/devstack-gate.config diff --git a/gerrit/acls/openstack/devstack-gate.config b/gerrit/acls/openstack/devstack-gate.config deleted file mode 100644 index 104d90575b..0000000000 --- a/gerrit/acls/openstack/devstack-gate.config +++ /dev/null @@ -1,18 +0,0 @@ -[access] - inheritFrom = openstack/meta-config - -[access "refs/heads/*"] - abandon = group devstack-gate-core - label-Code-Review = -2..+2 group devstack-gate-core - label-Workflow = -1..+1 group devstack-gate-core - toggleWipState = group devstack-gate-core - -[access "refs/tags/*"] - createSignedTag = group devstack-gate-release - -[receive] - requireChangeId = true - requireContributorAgreement = true - -[submit] - mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 6f51c94730..cfe987a042 100644 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -3407,10 +3407,8 @@ description: System for quickly installing an OpenStack cloud from upstream git for testing and development. - project: openstack/devstack-gate - description: Run DevStack in the gate - use-storyboard: true - groups: - - openstack-ci + description: RETIRED, Run DevStack in the gate + acl-config: /home/gerrit2/acls/openstack/retired.config - project: openstack/devstack-plugin-amqp1 description: DevStack plugin to configure AMQP1. acl-config: /home/gerrit2/acls/openstack/oslo.messaging.config diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index 3632dd59a6..0e9fbdf30a 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -628,7 +628,6 @@ openstack-infra: projects: - openstack/bugdaystats - openstack/ci-log-processing - - openstack/devstack-gate - openstack/logstash-filters - openstack/nose-html-output - openstack/openstack-nose @@ -1057,7 +1056,6 @@ openstack-qa: - openstack/bashate - openstack/coverage2sql - openstack/devstack - - openstack/devstack-gate - openstack/devstack-plugin-ceph - openstack/devstack-plugin-cookiecutter - openstack/devstack-plugin-nfs diff --git a/nodepool/elements/README.rst b/nodepool/elements/README.rst index 61ee13fa9d..e701fce073 100644 --- a/nodepool/elements/README.rst +++ b/nodepool/elements/README.rst @@ -1,8 +1,8 @@ -Using diskimage-builder to build devstack-gate nodes +Using diskimage-builder to build opendev-ci nodes ==================================================== In addition to being able to just download and consume images that are the -same as what run devstack-gate, it's easy to make your own for local dev or +same as what run devstack, it's easy to make your own for local dev or testing - or just for fun. Install diskimage-builder @@ -54,7 +54,7 @@ a loopback device using qemu-nbd. sudo apt-get install qemu-utils sudo modprobe nbd max_part=16 sudo mkdir -p /tmp/newimage - sudo qemu-nbd -c /dev/nbd1 /path/to/devstack-gate-precise.qcow2 + sudo qemu-nbd -c /dev/nbd1 /path/to/opendev-ci-node-precise.qcow2 sudo mount /dev/nbd1p1 /tmp/newimage or use the scripts @@ -63,7 +63,7 @@ or use the scripts sudo apt-get install qemu-utils sudo modprobe nbd max_part=16 - sudo tools/mount-image.sh devstack-gate-precise.qcow2 + sudo tools/mount-image.sh opendev-ci-node-precise.qcow2 sudo tools/umount-image.sh Other things diff --git a/nodepool/elements/zuul-worker/install.d/60-zuul-worker b/nodepool/elements/zuul-worker/install.d/60-zuul-worker index bb56718924..c43b4d37a8 100755 --- a/nodepool/elements/zuul-worker/install.d/60-zuul-worker +++ b/nodepool/elements/zuul-worker/install.d/60-zuul-worker @@ -37,7 +37,7 @@ chown -R zuul:zuul /home/zuul # "historical" reasons, ensure this is available in /home/zuul # # We do this for zuul as relative paths to the current user's homedir -# are used in places like devstack-gate. +# are used in places like devstack. # # Check if the cache exists as we don't have a strict dependency on the # devstack-cache element. This allows you to build an image without diff --git a/tools/build-image.sh b/tools/build-image.sh index b669a76bed..8c1ef3ec05 100755 --- a/tools/build-image.sh +++ b/tools/build-image.sh @@ -39,7 +39,7 @@ export DISTRO=${DISTRO:-ubuntu-minimal} # export ARCH=arm64 export ELEMENTS_PATH=${ELEMENTS_PATH:-nodepool/elements} -export IMAGE_NAME=${IMAGE_NAME:-devstack-gate} +export IMAGE_NAME=${IMAGE_NAME:-opendev-ci-image} export NODEPOOL_SCRIPTDIR=${NODEPOOL_SCRIPTDIR:-nodepool/scripts} export EXTRA_ELEMENTS=${EXTRA_ELEMENTS:-} diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 4bac1cf721..4ce3944880 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -1732,12 +1732,6 @@ templates: - official-openstack-repo-jobs -- project: - name: openstack/devstack-gate - templates: - - official-openstack-repo-jobs - - noop-jobs - - project: name: openstack/devstack-plugin-amqp1 templates: diff --git a/zuul/main.yaml b/zuul/main.yaml index 6a215c8b04..e445846c89 100644 --- a/zuul/main.yaml +++ b/zuul/main.yaml @@ -178,9 +178,8 @@ shadow: openstack/project-config - openstack/openstack-zuul-jobs - openstack/openstack-zuul-roles - # devstack-gate, devstack and tempest all define things expected + # devstack and tempest all define things expected # to be widely used. - - openstack/devstack-gate - openstack/devstack - openstack/tempest # openstack-ansible-tests is used across multiple