diff options
| -rw-r--r-- | jjb/functest/xtesting-ci.yaml | 85 | ||||
| -rw-r--r-- | releases/orinoco/barometer.yaml | 17 | ||||
| -rw-r--r-- | releases/orinoco/kuberef.yaml | 17 | ||||
| -rw-r--r-- | releases/orinoco/thoth.yaml | 17 |
4 files changed, 130 insertions, 6 deletions
diff --git a/jjb/functest/xtesting-ci.yaml b/jjb/functest/xtesting-ci.yaml index e8b0222b0..64a3fb87c 100644 --- a/jjb/functest/xtesting-ci.yaml +++ b/jjb/functest/xtesting-ci.yaml @@ -6,7 +6,7 @@ set +x sudo apt-get -o DPkg::Lock::Timeout=300 update sudo DEBIAN_FRONTEND=noninteractive apt-get \ - -o DPkg::Lock::Timeout=300 install python3-pip docker.io -y + -o DPkg::Lock::Timeout=300 install python3-pip docker.io podman -y curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.17.0/kind-linux-amd64 chmod +x ./kind sudo mv ./kind /usr/local/bin/kind @@ -17,8 +17,10 @@ sudo rm -f /etc/systemd/system/docker.service.d/http-proxy.conf sudo systemctl daemon-reload sudo systemctl restart docker - sudo rm -rfv /data - sudo apt-get install ansible -y + sudo podman ps -aq |xargs sudo podman stop || true + sudo podman ps -aq |xargs sudo podman rm || true + sudo rm -rfv /data /tmp/xtesting* + sudo apt-get install ansible patch -y rm -rf ~/.ansible/roles/collivier.xtesting case {release} in stable) @@ -31,6 +33,44 @@ ansible-galaxy collection install -f -r ~/.ansible/roles/collivier.xtesting/requirements.yml ansible-playbook -vvvv ~/.ansible/roles/collivier.xtesting/tests/{playbook}.yml +- builder: + name: xtesting-ci-tests-remote + builders: + - shell: | + set +x + ssh opnfv@10.200.140.224 << EOF + sudo apt-get -o DPkg::Lock::Timeout=300 update + sudo DEBIAN_FRONTEND=noninteractive apt-get \ + -o DPkg::Lock::Timeout=300 install python3-pip docker.io podman -y + curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.17.0/kind-linux-amd64 + chmod +x ./kind + sudo mv ./kind /usr/local/bin/kind + kind delete clusters xtesting jenkins gitlab || true + sudo docker ps -aq |xargs sudo docker stop || true + sudo docker ps -aq |xargs sudo docker rm || true + sudo docker system prune -f --all || true + sudo rm -f /etc/systemd/system/docker.service.d/http-proxy.conf + sudo systemctl daemon-reload + sudo systemctl restart docker + sudo podman ps -aq |xargs sudo podman stop || true + sudo podman ps -aq |xargs sudo podman rm || true + sudo rm -rfv /data /tmp/xtesting* + EOF + sudo apt-get install ansible patch -y + rm -rf ~/.ansible/roles/collivier.xtesting + case {release} in + stable) + ansible-galaxy install -f collivier.xtesting ;; + *) + ansible-galaxy install -f git+https://github.com/collivier/ansible-role-xtesting.git,{release} + mv ~/.ansible/roles/ansible-role-xtesting ~/.ansible/roles/collivier.xtesting ;; + esac + (cd ~/.ansible/roles/collivier.xtesting; patch -p1 < tests/docker_config_json.patch) + ansible-galaxy collection install -f -r ~/.ansible/roles/collivier.xtesting/requirements.yml + sed -i "s/127.0.0.1/10.200.140.224/g" ~/.ansible/roles/collivier.xtesting/tests/{playbook}.yml + echo 10.200.140.224 ansible_host=10.200.140.224 ansible_user=opnfv > /tmp/inventory + ansible-playbook -i /tmp/inventory -vvvv ~/.ansible/roles/collivier.xtesting/tests/{playbook}.yml + - parameter: name: xtesting-ci-node parameters: @@ -56,11 +96,29 @@ playbook: '{playbook}' release: '{release}' -- project: - name: xtesting-ci-tests - node: xtestingci +- job-template: + name: 'xtesting-ci-tests-remote-{release}-{playbook}' + triggers: + - timed: '@daily' + parameters: + - xtesting-ci-node: + node: '{node}' + properties: + - build-blocker: + use-build-blocker: true + blocking-level: 'NODE' + blocking-jobs: + - '^xtesting-ci-tests-.*$' + builders: + - xtesting-ci-tests-remote: + playbook: '{playbook}' + release: '{release}' + +- playbook: &playbook + name: 'playbook' playbook: - all + - podman - proxy - proxy2 - radosgw @@ -90,12 +148,27 @@ - k8s_gitlab_kind1 - k8s_gitlab_kind2 - k8s_gitlab_kind3 + +- project: + name: xtesting-ci-tests + <<: *playbook + node: xtestingci release: - stable - master jobs: - 'xtesting-ci-tests-{release}-{playbook}' +- project: + name: xtesting-ci-tests-remote + <<: *playbook + node: xtesting + release: + - stable + - master + jobs: + - 'xtesting-ci-tests-remote-{release}-{playbook}' + - view: name: xtesting-ci view-type: list diff --git a/releases/orinoco/barometer.yaml b/releases/orinoco/barometer.yaml new file mode 100644 index 000000000..897e8dba0 --- /dev/null +++ b/releases/orinoco/barometer.yaml @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2021 The Linux Foundation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +project: barometer +project-type: feature +release-model: stable + +branches: + - name: stable/orinoco + location: + barometer: 41195d4c2c3418e8c2daa44c792406be2fc54964 diff --git a/releases/orinoco/kuberef.yaml b/releases/orinoco/kuberef.yaml new file mode 100644 index 000000000..dfbffa0ce --- /dev/null +++ b/releases/orinoco/kuberef.yaml @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2020 The Linux Foundation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +project: kuberef +project-type: installer +release-model: stable + +branches: + - name: stable/orinoco + location: + kuberef: 486015325b01283f31595abd8fbdbf93530f6a5a diff --git a/releases/orinoco/thoth.yaml b/releases/orinoco/thoth.yaml new file mode 100644 index 000000000..f19c443c1 --- /dev/null +++ b/releases/orinoco/thoth.yaml @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2021 The Linux Foundation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +project: thoth +project-type: feature +release-model: stable + +branches: + - name: stable/orinoco + location: + thoth: 77a6ce27efa02f72568950e37aed3853f05ecd4b |