Browse Source

Remove papr test files

Russell Teague 6 năm trước cách đây
mục cha
commit
0ece69566f
5 tập tin đã thay đổi với 0 bổ sung313 xóa
  1. 0 46
      .papr-master-ha.inventory
  2. 0 33
      .papr.all-in-one.inventory
  3. 0 34
      .papr.inventory
  4. 0 102
      .papr.sh
  5. 0 98
      .papr.yml

+ 0 - 46
.papr-master-ha.inventory

@@ -1,46 +0,0 @@
-[OSEv3:children]
-masters
-nodes
-etcd
-
-[OSEv3:vars]
-ansible_ssh_user=root
-ansible_python_interpreter=/usr/bin/python3
-openshift_deployment_type=origin
-openshift_release="{{ lookup('env', 'target_branch') }}"
-openshift_master_default_subdomain="{{ lookup('env', 'RHCI_ocp_master1_IP') }}.xip.io"
-openshift_check_min_host_disk_gb=1.5
-openshift_check_min_host_memory_gb=1.9
-openshift_portal_net=172.30.0.0/16
-openshift_enable_service_catalog=false
-debug_level=4
-openshift_docker_options="--log-driver=journald"
-
-my_node_group1_labels=['node-role.kubernetes.io/master=true', 'node-role.kubernetes.io/infra=true', 'node-role.kubernetes.io/compute=true']
-my_node_group1={'name': 'node-config-all-in-one', 'labels': {{ my_node_group1_labels }} }
-
-openshift_node_groups=[{{ my_node_group1 }}]
-
-openshift_node_group_name="node-config-all-in-one"
-
-[all:vars]
-# bootstrap configs
-openshift_master_bootstrap_auto_approve=true
-openshift_master_bootstrap_auto_approver_node_selector={"node-role.kubernetes.io/master":"true"}
-osm_controller_args={"experimental-cluster-signing-duration": ["20m"]}
-osm_default_node_selector="node-role.kubernetes.io/compute=true"
-
-[masters]
-ocp-master1
-ocp-master2
-ocp-master3
-
-[etcd]
-ocp-master1
-ocp-master2
-ocp-master3
-
-[nodes]
-ocp-master1 openshift_schedulable=true
-ocp-master2
-ocp-master3

+ 0 - 33
.papr.all-in-one.inventory

@@ -1,33 +0,0 @@
-[OSEv3:children]
-masters
-nodes
-etcd
-
-[OSEv3:vars]
-ansible_ssh_user=root
-ansible_python_interpreter=/usr/bin/python3
-openshift_deployment_type=origin
-openshift_release="{{ lookup('env', 'target_branch') }}"
-openshift_master_default_subdomain="{{ lookup('env', 'RHCI_ocp_master_IP') }}.xip.io"
-openshift_check_min_host_disk_gb=1.5
-openshift_check_min_host_memory_gb=1.9
-openshift_portal_net=172.30.0.0/16
-openshift_enable_service_catalog=false
-debug_level=4
-openshift_docker_options="--log-driver=journald"
-
-[all:vars]
-# bootstrap configs
-openshift_master_bootstrap_auto_approve=true
-openshift_master_bootstrap_auto_approver_node_selector={"node-role.kubernetes.io/master":"true"}
-osm_controller_args={"experimental-cluster-signing-duration": ["20m"]}
-osm_default_node_selector="node-role.kubernetes.io/compute=true"
-
-[masters]
-ocp-master
-
-[etcd]
-ocp-master
-
-[nodes]
-ocp-master openshift_schedulable=true ansible_host="{{ lookup('env', 'RHCI_ocp_master_IP') }}" openshift_node_group_name="node-config-all-in-one"

+ 0 - 34
.papr.inventory

@@ -1,34 +0,0 @@
-[OSEv3:children]
-masters
-nodes
-etcd
-
-[OSEv3:vars]
-ansible_ssh_user=root
-ansible_python_interpreter=/usr/bin/python3
-openshift_deployment_type=origin
-openshift_release="{{ lookup('env', 'target_branch') }}"
-openshift_master_default_subdomain="{{ lookup('env', 'RHCI_ocp_node1_IP') }}.xip.io"
-openshift_check_min_host_disk_gb=1.5
-openshift_check_min_host_memory_gb=1.9
-openshift_portal_net=172.30.0.0/16
-debug_level=4
-openshift_docker_options="--log-driver=journald"
-
-[all:vars]
-# bootstrap configs
-openshift_master_bootstrap_auto_approve=true
-openshift_master_bootstrap_auto_approver_node_selector={"node-role.kubernetes.io/master":"true"}
-osm_controller_args={"experimental-cluster-signing-duration": ["20m"]}
-osm_default_node_selector="node-role.kubernetes.io/compute=true"
-
-[masters]
-ocp-master
-
-[etcd]
-ocp-master
-
-[nodes]
-ocp-master openshift_schedulable=true openshift_node_group_name="node-config-master-infra"
-ocp-node1 openshift_node_group_name="node-config-infra" openshift_node_group_name="node-config-compute"
-ocp-node2 openshift_node_group_name="node-config-infra" openshift_node_group_name="node-config-compute"

+ 0 - 102
.papr.sh

@@ -1,102 +0,0 @@
-#!/bin/bash
-set -xeuo pipefail
-
-# Essentially use a similar procedure other openshift-ansible PR tests use to
-# determine which image tag should be used. This allows us to avoid hardcoding a
-# specific version which quickly becomes stale.
-
-if [ -n "${PAPR_BRANCH:-}" ]; then
-  target_branch=$PAPR_BRANCH
-else
-  target_branch=$PAPR_PULL_TARGET_BRANCH
-fi
-target_branch_in=${target_branch}
-if [[ "${target_branch}" =~ ^release- ]]; then
-  target_branch="${target_branch/release-/}"
-else
-  dnf install -y sed
-  target_branch="$( git describe | sed 's/^openshift-ansible-\([0-9]*\.[0-9]*\)\.[0-9]*-.*/\1/' )"
-fi
-export target_branch
-
-# Need to define some git variables for rebase.
-git config --global user.email "ci@openshift.org"
-git config --global user.name "OpenShift Atomic CI"
-
-# Rebase existing branch on the latest code locally, as PAPR running doesn't do merges
-git fetch origin ${target_branch_in} && git rebase origin/${target_branch_in}
-
-PAPR_INVENTORY=${PAPR_INVENTORY:-.papr.inventory}
-PAPR_RUN_UPDATE=${PAPR_RUN_UPDATE:-0}
-PAPR_UPGRADE_FROM=${PAPR_UPGRADE_FROM:-0}
-PAPR_EXTRAVARS=""
-
-# Replace current branch with PAPR_UPGRADE_FROM
-if [[ "${PAPR_UPGRADE_FROM}" != "0" ]]; then
-  git branch new-code
-  git checkout release-${PAPR_UPGRADE_FROM}
-  git clean -fdx
-  PAPR_EXTRAVARS="-e openshift_release=${PAPR_UPGRADE_FROM}"
-fi
-
-pip install -r requirements.txt
-
-# Human-readable output
-export ANSIBLE_STDOUT_CALLBACK=debug
-
-# ping the nodes to check they're responding and register their ostree versions
-ansible -vv -i $PAPR_INVENTORY nodes -a 'rpm-ostree status'
-
-# Make sure hostname -f returns correct node name
-ansible -vv -i $PAPR_INVENTORY nodes -m setup
-ansible -vv -i $PAPR_INVENTORY nodes -a "hostnamectl set-hostname {{ ansible_default_ipv4.address }}"
-ansible -vv -i $PAPR_INVENTORY nodes -m setup -a "gather_subset=min"
-
-upload_journals() {
-  mkdir journals
-  ansible -vvv -i $PAPR_INVENTORY all \
-    -m shell -a 'journalctl --no-pager > /tmp/journal'
-  ansible -vvv -i $PAPR_INVENTORY all \
-    -m fetch -a "src=/tmp/journal dest=journals/{{ inventory_hostname }}.log flat=yes"
-
-  # Split large files into parts, extracting a basename and preserving extention
-  find . -iname "*.log" -execdir sh -c 'split -b 4m --numeric-suffixes --additional-suffix=.log {} $(basename {} .log)_' \; -execdir rm -rf {} \;
-}
-
-trap upload_journals ERR
-
-# run the prerequisites play
-ansible-playbook -vvv -i $PAPR_INVENTORY $PAPR_EXTRAVARS playbooks/prerequisites.yml
-
-# run the actual installer
-ansible-playbook -vvv -i $PAPR_INVENTORY $PAPR_EXTRAVARS playbooks/deploy_cluster.yml
-
-# Restore the branch if needed
-if [[ "${PAPR_UPGRADE_FROM}" != "0" ]]; then
-  git checkout new-code
-  git clean -fdx
-  pip install -r requirements.txt
-fi
-
-# Run upgrade playbook
-if [[ "${PAPR_RUN_UPDATE}" != "0" ]]; then
-  update_version="$(echo $target_branch | sed 's/\./_/')"
-  # Create basic node-group configmaps for upgrade
-  ansible-playbook -vvv -i $PAPR_INVENTORY $PAPR_EXTRAVARS playbooks/openshift-master/openshift_node_group.yml
-  ansible-playbook -vvv -i $PAPR_INVENTORY playbooks/byo/openshift-cluster/upgrades/v${update_version}/upgrade.yml | tee update.log
-fi
-
-upload_journals
-
-### DISABLING TESTS FOR NOW, SEE:
-### https://github.com/openshift/openshift-ansible/pull/6132
-
-### # run a small subset of origin conformance tests to sanity
-### # check the cluster NB: we run it on the master since we may
-### # be in a different OSP network
-### ssh ocp-master docker run --rm --net=host --privileged \
-###   -v /etc/origin/master/admin.kubeconfig:/config \
-###   registry.fedoraproject.org/fedora:27 sh -c \
-###     '"dnf install -y origin-tests && \
-###       KUBECONFIG=/config /usr/libexec/origin/extended.test --ginkgo.v=1 \
-###         --ginkgo.noColor --ginkgo.focus=\"Services.*NodePort|EmptyDir\""'

+ 0 - 98
.papr.yml

@@ -1,98 +0,0 @@
----
-
-# This YAML file is used by PAPR. It details the test
-# environment to provision and the test procedure. For more
-# information on PAPR, see:
-#
-#   https://github.com/projectatomic/papr
-#
-# The PAPR YAML specification detailing allowed fields can
-# be found at:
-#
-#   https://github.com/projectatomic/papr/blob/master/sample.papr.yml
-
-cluster:
-  hosts:
-    - name: ocp-master
-      distro: fedora/27/atomic
-      specs:
-        ram: 4096
-    - name: ocp-node1
-      distro: fedora/27/atomic
-    - name: ocp-node2
-      distro: fedora/27/atomic
-  container:
-    image: registry.fedoraproject.org/fedora:27
-
-packages:
-  - gcc
-  - git
-  - python-pip
-  - python-devel
-  - libffi-devel
-  - openssl-devel
-  - redhat-rpm-config
-  - findutils
-
-context: 'fedora/27/atomic'
-
-tests:
-  - ./.papr.sh
-
-artifacts:
-  - journals/
-
-pulls: false
-required: false
-
----
-inherit: true
-context: 'fedora/27/atomic/upgrade_minor'
-
-cluster:
-  hosts:
-    - name: ocp-master
-      distro: fedora/27/atomic
-      specs:
-        ram: 4096
-  container:
-    image: registry.fedoraproject.org/fedora:27
-env:
-  PAPR_INVENTORY: .papr.all-in-one.inventory
-  PAPR_RUN_UPDATE: "yes"
-
----
-inherit: true
-context: 'fedora/27/atomic/upgrade_major'
-
-cluster:
-  hosts:
-    - name: ocp-master
-      distro: fedora/27/atomic
-      specs:
-        ram: 4096
-  container:
-    image: registry.fedoraproject.org/fedora:27
-env:
-  PAPR_INVENTORY: .papr.all-in-one.inventory
-  PAPR_UPGRADE_FROM: "3.10"
-  PAPR_RUN_UPDATE: "yes"
----
-inherit: true
-context: 'fedora/27/atomic/master-ha'
-
-cluster:
-  hosts:
-    - name: ocp-master1
-      distro: fedora/27/atomic
-      specs:
-        ram: 4096
-    - name: ocp-master2
-      distro: fedora/27/atomic
-    - name: ocp-master3
-      distro: fedora/27/atomic
-  container:
-    image: registry.fedoraproject.org/fedora:27
-
-env:
-  PAPR_INVENTORY: .papr-master-ha.inventory