From fdd41c706addafc450df60b936d83f047c50c211 Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Tue, 18 Apr 2017 12:07:03 +0200 Subject: [PATCH] Remove and ignore .bak files --- .gitignore | 1 + .travis.yml.bak | 161 ------------------------------------------------ 2 files changed, 1 insertion(+), 161 deletions(-) delete mode 100644 .travis.yml.bak diff --git a/.gitignore b/.gitignore index e7bbe0bea..f4c7d990a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ temp .idea .tox .cache +*.bak *.egg-info *.pyc *.pyo diff --git a/.travis.yml.bak b/.travis.yml.bak deleted file mode 100644 index 7b948dcfe..000000000 --- a/.travis.yml.bak +++ /dev/null @@ -1,161 +0,0 @@ -sudo: required - -services: - - docker - -git: - depth: 5 - -env: - global: - GCE_USER=travis - SSH_USER=$GCE_USER - TEST_ID=$TRAVIS_JOB_NUMBER - CONTAINER_ENGINE=docker - PRIVATE_KEY=$GCE_PRIVATE_KEY - GS_ACCESS_KEY_ID=$GS_KEY - GS_SECRET_ACCESS_KEY=$GS_SECRET - ANSIBLE_KEEP_REMOTE_FILES=1 - CLUSTER_MODE=default - BOOTSTRAP_OS=none - matrix: - # Debian Jessie - - >- - KUBE_NETWORK_PLUGIN=canal - CLOUD_IMAGE=debian-8-kubespray - CLOUD_REGION=asia-east1-a - CLUSTER_MODE=ha - - >- - KUBE_NETWORK_PLUGIN=calico - CLOUD_IMAGE=debian-8-kubespray - CLOUD_REGION=europe-west1-c - CLUSTER_MODE=default - - # Centos 7 - - >- - KUBE_NETWORK_PLUGIN=flannel - CLOUD_IMAGE=centos-7 - CLOUD_REGION=asia-northeast1-c - CLUSTER_MODE=default - - >- - KUBE_NETWORK_PLUGIN=calico - CLOUD_IMAGE=centos-7 - CLOUD_REGION=us-central1-b - CLUSTER_MODE=ha - - # Redhat 7 - - >- - KUBE_NETWORK_PLUGIN=weave - CLOUD_IMAGE=rhel-7 - CLOUD_REGION=us-east1-c - CLUSTER_MODE=default - - # CoreOS stable - #- >- - # KUBE_NETWORK_PLUGIN=weave - # CLOUD_IMAGE=coreos-stable - # CLOUD_REGION=europe-west1-b - # CLUSTER_MODE=ha - # BOOTSTRAP_OS=coreos - - >- - KUBE_NETWORK_PLUGIN=canal - CLOUD_IMAGE=coreos-stable - CLOUD_REGION=us-west1-b - CLUSTER_MODE=default - BOOTSTRAP_OS=coreos - - # Extra cases for separated roles - - >- - KUBE_NETWORK_PLUGIN=canal - CLOUD_IMAGE=rhel-7 - CLOUD_REGION=asia-northeast1-b - CLUSTER_MODE=separate - - >- - KUBE_NETWORK_PLUGIN=weave - CLOUD_IMAGE=ubuntu-1604-xenial - CLOUD_REGION=europe-west1-d - CLUSTER_MODE=separate - - >- - KUBE_NETWORK_PLUGIN=calico - CLOUD_IMAGE=coreos-stable - CLOUD_REGION=us-central1-f - CLUSTER_MODE=separate - BOOTSTRAP_OS=coreos - -matrix: - allow_failures: - - env: KUBE_NETWORK_PLUGIN=weave CLOUD_IMAGE=coreos-stable CLOUD_REGION=europe-west1-b CLUSTER_MODE=ha BOOTSTRAP_OS=coreos - -before_install: - # Install Ansible. - - pip install --user ansible - - pip install --user netaddr - # W/A https://github.com/ansible/ansible-modules-core/issues/5196#issuecomment-253766186 - - pip install --user apache-libcloud==0.20.1 - - pip install --user boto==2.9.0 -U - # Load cached docker images - - if [ -d /var/tmp/releases ]; then find /var/tmp/releases -type f -name "*.tar" | xargs -I {} sh -c "zcat {} | docker load"; fi - -cache: - - directories: - - $HOME/.cache/pip - - $HOME/.local - - /var/tmp/releases - -before_script: - - echo "RUN $TRAVIS_JOB_NUMBER $KUBE_NETWORK_PLUGIN $CONTAINER_ENGINE " - - mkdir -p $HOME/.ssh - - echo $PRIVATE_KEY | base64 -d > $HOME/.ssh/id_rsa - - echo $GCE_PEM_FILE | base64 -d > $HOME/.ssh/gce - - chmod 400 $HOME/.ssh/id_rsa - - chmod 755 $HOME/.local/bin/ansible-playbook - - $HOME/.local/bin/ansible-playbook --version - - cp tests/ansible.cfg . - - export PYPATH=$([ $BOOTSTRAP_OS = none ] && echo /usr/bin/python || echo /opt/bin/python) -# - "echo $HOME/.local/bin/ansible-playbook -i inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS -b --become-user=root -e '{\"cloud_provider\": true}' $LOG_LEVEL -e kube_network_plugin=${KUBE_NETWORK_PLUGIN} setup-kubernetes/cluster.yml" - -script: - - > - $HOME/.local/bin/ansible-playbook tests/cloud_playbooks/create-gce.yml -i tests/local_inventory/hosts.cfg -c local $LOG_LEVEL - -e mode=${CLUSTER_MODE} - -e test_id=${TEST_ID} - -e kube_network_plugin=${KUBE_NETWORK_PLUGIN} - -e gce_project_id=${GCE_PROJECT_ID} - -e gce_service_account_email=${GCE_ACCOUNT} - -e gce_pem_file=${HOME}/.ssh/gce - -e cloud_image=${CLOUD_IMAGE} - -e inventory_path=${PWD}/inventory/inventory.ini - -e cloud_region=${CLOUD_REGION} - - # Create cluster with netchecker app deployed - - > - $HOME/.local/bin/ansible-playbook -i inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS - -b --become-user=root -e cloud_provider=gce $LOG_LEVEL -e kube_network_plugin=${KUBE_NETWORK_PLUGIN} - -e bootstrap_os=${BOOTSTRAP_OS} - -e ansible_python_interpreter=${PYPATH} - -e download_run_once=true - -e download_localhost=true - -e local_release_dir=/var/tmp/releases - -e deploy_netchecker=true - cluster.yml - - # Tests Cases - ## Test Master API - - $HOME/.local/bin/ansible-playbook -i inventory/inventory.ini -e ansible_python_interpreter=${PYPATH} -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS -b --become-user=root tests/testcases/010_check-apiserver.yml $LOG_LEVEL - ## Ping the between 2 pod - - $HOME/.local/bin/ansible-playbook -i inventory/inventory.ini -e ansible_python_interpreter=${PYPATH} -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS -b --become-user=root tests/testcases/030_check-network.yml $LOG_LEVEL - ## Advanced DNS checks - - $HOME/.local/bin/ansible-playbook -i inventory/inventory.ini -e ansible_python_interpreter=${PYPATH} -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS -b --become-user=root tests/testcases/040_check-network-adv.yml $LOG_LEVEL - -after_script: - - > - $HOME/.local/bin/ansible-playbook -i inventory/inventory.ini tests/cloud_playbooks/delete-gce.yml -c local $LOG_LEVEL - -e mode=${CLUSTER_MODE} - -e test_id=${TEST_ID} - -e kube_network_plugin=${KUBE_NETWORK_PLUGIN} - -e gce_project_id=${GCE_PROJECT_ID} - -e gce_service_account_email=${GCE_ACCOUNT} - -e gce_pem_file=${HOME}/.ssh/gce - -e cloud_image=${CLOUD_IMAGE} - -e inventory_path=${PWD}/inventory/inventory.ini - -e cloud_region=${CLOUD_REGION}