diff --git a/.zuul.yaml b/.zuul.yaml index 5a2c23938..e834dd6a0 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -8,23 +8,6 @@ - zuul/nodepool nodeset: debian-bookworm -- job: - description: | - Test that nodepool works with openshift. - name: nodepool-functional-openshift - pre-run: playbooks/nodepool-functional-openshift/pre.yaml - run: playbooks/nodepool-functional-openshift/run.yaml - nodeset: - nodes: - # Runs openshift - - name: cluster - label: centos-7 - # Runs nodepool - - name: launcher - label: debian-bookworm - required-projects: - - zuul/nodepool - - secret: name: nodepool-registry-credentials data: @@ -279,7 +262,6 @@ - nodepool-nox-py311 - nodepool-functional-container-openstack-release - nodepool-functional-k8s - - nodepool-functional-openshift - zuul-quick-start: requires: zuul-container-image dependencies: nodepool-build-image @@ -295,7 +277,6 @@ nodeset: ubuntu-jammy - nodepool-nox-py311 - nodepool-functional-k8s - - nodepool-functional-openshift - zuul-quick-start: requires: zuul-container-image dependencies: nodepool-upload-image diff --git a/playbooks/nodepool-functional-openshift/pre.yaml b/playbooks/nodepool-functional-openshift/pre.yaml deleted file mode 100644 index 3cbe6c204..000000000 --- a/playbooks/nodepool-functional-openshift/pre.yaml +++ /dev/null @@ -1,34 +0,0 @@ -- name: Configure a multi node environment - hosts: all - tasks: - - name: Set up multi-node firewall - include_role: - name: multi-node-firewall - - - name: Set up multi-node firewall - include_role: - name: multi-node-hosts-file - -- hosts: launcher - roles: - - role: bindep - - role: ensure-zookeeper - zookeeper_use_tls: true - - role: ensure-nox - tasks: - # NOTE(ianw) 2022-09-07 : - # Shipped packages do not work and we need to use this statically - # linked binary; see - # https://issues.redhat.com/browse/OCPBUGS-559 - - name: Ensure oc client is installed - shell: | - CLIENT=openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit - wget https://github.com/openshift/origin/releases/download/v3.11.0/${CLIENT}.tar.gz - tar xvf ${CLIENT}.tar.gz - sudo mv ${CLIENT}/oc /usr/local/bin - sudo mv ${CLIENT}/kubectl /usr/local/bin - oc version - -- hosts: cluster - roles: - - ensure-openshift diff --git a/playbooks/nodepool-functional-openshift/run.yaml b/playbooks/nodepool-functional-openshift/run.yaml deleted file mode 100644 index fe9992af9..000000000 --- a/playbooks/nodepool-functional-openshift/run.yaml +++ /dev/null @@ -1,17 +0,0 @@ -- hosts: cluster - roles: - - deploy-openshift - -- hosts: launcher - pre_tasks: - - name: Login to the openshift cluster as developer - command: > - oc login -u developer -p developer --insecure-skip-tls-verify=true - https://{{ hostvars['cluster']['ansible_hostname'] }}:8443 - roles: - - role: nox - nox_session: functional_openshift - nox_environment: - NODEPOOL_ZK_CA: /opt/zookeeper/ca/certs/cacert.pem - NODEPOOL_ZK_CERT: /opt/zookeeper/ca/certs/client.pem - NODEPOOL_ZK_KEY: /opt/zookeeper/ca/keys/clientkey.pem