diff --git a/playbooks/bosh-openstack-cpi-release-acceptance-test/run.yaml b/playbooks/bosh-openstack-cpi-release-acceptance-test/run.yaml deleted file mode 100644 index 800753893218e..0000000000000 --- a/playbooks/bosh-openstack-cpi-release-acceptance-test/run.yaml +++ /dev/null @@ -1,92 +0,0 @@ -- hosts: all - become: yes - - pre_tasks: - - name: Prepare local conf for cf validation tests - shell: | - set -ex - - cat >> /tmp/dg-local.conf <<< ' - [[local|localrc]] - NETWORK_GATEWAY=10.0.0.1 - IDENTITY_API_VERSION=3 - OS_USER_DOMAIN_ID=default - OS_PROJECT_DOMAIN_ID=default - VOLUME_BACKING_FILE_SIZE=62000M - ' - args: - executable: /bin/bash - - roles: - - clone-devstack-gate-to-workspace - - install-devstack - - tasks: - - name: Run validation tests of cf-openstack-validator aganist devstack - shell: | - set -ex - - # Install bosh client and dependencies - curl -Lo ./bosh https://s3.amazonaws.com/bosh-cli-artifacts/bosh-cli-3.0.1-linux-amd64 - chmod +x ./bosh - mv ./bosh /usr/local/bin/bosh - apt-get install -y build-essential zlibc zlib1g-dev ruby ruby-dev openssl libxslt-dev libxml2-dev libssl-dev libreadline6 libreadline6-dev libyaml-dev libsqlite3-dev sqlite3 - gem install bundler - - # Create latest cpi release - bosh create-release --force --tarball bosh-openstack-cpi.tgz - - # Git clone cf-openstack-validator - git clone https://github.com/cloudfoundry-incubator/cf-openstack-validator '{{ ansible_user_dir }}/src/github.com/cloudfoundry-incubator/cf-openstack-validator' - cp bosh-openstack-cpi.tgz '{{ ansible_user_dir }}/src/github.com/cloudfoundry-incubator/cf-openstack-validator' - - pushd '{{ ansible_user_dir }}/src/github.com/cloudfoundry-incubator/cf-openstack-validator' - source /opt/stack/new/devstack/openrc admin admin - INSTANCE_TYPE=m1.cf - openstack flavor create --ram 512 --disk 4 --vcpu 1 --id 99 "$INSTANCE_TYPE" - - source /opt/stack/new/devstack/openrc demo demo - FLOATING_IP=$(openstack floating ip create public -f value -c floating_ip_address) - STATIC_IP=10.0.0.50 - # Allow ssh access in the default security group - openstack security group rule create --ingress --protocol tcp --dst-port 22 default - ssh-keygen -t rsa -b 4096 -N '' -f cf-validator.rsa_id - openstack keypair create cf-validator --public-key cf-validator.rsa_id.pub - NETWORK_ID=$(openstack network show private -f value -c id) - # Update subnet dns to allow access to internet - neutron subnet-update --dns-nameserver 8.8.8.8 private-subnet - - # Populate validator.yml - cp validator.template.yml validator.yml - sed -i "/auth_url/ s||$OS_AUTH_URL|" validator.yml - sed -i "/username/ s||$OS_USERNAME|" validator.yml - sed -i "/password/ s||$OS_PASSWORD|" validator.yml - sed -i "/domain/ s||$OS_PROJECT_DOMAIN_ID|" validator.yml - sed -i "/project/ s||$OS_PROJECT_NAME|" validator.yml - sed -i "/network_id/ s||$NETWORK_ID|" validator.yml - sed -i "/floating_ip/ s||$FLOATING_IP|" validator.yml - sed -i "/static_ip/ s||$STATIC_IP|" validator.yml - sed -i "/instance_type/ s||$INSTANCE_TYPE|" validator.yml - sed -i "/use_external_ip/ s|false|true|" validator.yml - - # Download stemcell and change the hypervisor to qemu - mkdir bosh-openstack-kvm-ubuntu-trusty-go_agent - pushd bosh-openstack-kvm-ubuntu-trusty-go_agent - wget --content-disposition https://bosh.io/d/stemcells/bosh-openstack-kvm-ubuntu-trusty-go_agent -O bosh-openstack-kvm-ubuntu-trusty-go_agent.tgz - tar -zxvf bosh-openstack-kvm-ubuntu-trusty-go_agent.tgz - rm bosh-openstack-kvm-ubuntu-trusty-go_agent.tgz - sed -i 's/kvm/qemu/g' stemcell.MF - tar -zcvf bosh-openstack-qemu-ubuntu-trusty-go_agent.tgz * - mv bosh-openstack-qemu-ubuntu-trusty-go_agent.tgz ../ - popd - - # Run test - bundle install - ./validate -s bosh-openstack-qemu-ubuntu-trusty-go_agent.tgz -c validator.yml -r bosh-openstack-cpi.tgz --tag cpi_api - popd - - # Collect cpi logs - ln -s ~/.cf-openstack-validator/logs '{{ ansible_user_dir }}/workspace/logs/cpi-logs' - args: - executable: /bin/bash - chdir: '{{ zuul.project.src_dir }}' diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 83d9d9329e4b2..943286bedcbf3 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -1,7 +1,5 @@ # Shared jobs specific to the OpenLab Project -# Shared jobs specific to the OpenLab Project - - job: name: base parent: null @@ -341,16 +339,6 @@ secrets: - opentelekomcloud_credentials -- job: - name: bosh-openstack-cpi-release-acceptance-test-newton - parent: init-test - description: | - This job validation tests of bosh-openstack-cpi-release aganist OpenStack Newton release - run: playbooks/bosh-openstack-cpi-release-acceptance-test/run.yaml - vars: - global_env: - OS_BRANCH: stable/newton - - job: name: openstacksdk-ansible-devel-functional-devstack parent: init-test diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index e6b1f93f39a51..03d71f5d501d8 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -3,12 +3,6 @@ jobs: - openlab-zuul-jobs-check -- project: - name: cloudfoundry-incubator/bosh-openstack-cpi-release - recheck-newton: - jobs: - - bosh-openstack-cpi-release-acceptance-test-newton - - project: name: ansible/ansible check: