From f1725f3123cd932b8ad84068baa91b4da68c67ce Mon Sep 17 00:00:00 2001 From: Stanislav Egorov Date: Wed, 8 Jul 2020 18:51:24 -0700 Subject: [PATCH] Cleaning for gate scripts Removed orphaned local scripts because some roles were removed. Fixed env vars for proper configuration. Updated documentation accordingly. Change-Id: I37f0c8d038fb51ddaa57664a65d347056df6f007 --- docs/source/developers.md | 22 +++++---- playbooks/airship-airshipctl-test-runner.yaml | 45 ------------------- playbooks/airshipctl-gate-runner.yaml | 1 + roles/airshipctl-run-script/tasks/main.yaml | 5 ++- tools/deployment/22_test_configs.sh | 3 +- ...n_test_runner.sh => 20_run_gate_runner.sh} | 2 +- tools/gate/21_systemwide_executable.sh | 29 ------------ tools/gate/22_test_configs.sh | 30 ------------- tools/gate/23_build_ephemeral_iso.sh | 29 ------------ tools/gate/25_deploy_ephemeral_node.sh | 29 ------------ tools/gate/27_phase_apply_initinfra.sh | 29 ------------ tools/gate/29_cluster_init.sh | 29 ------------ tools/gate/30_phase_controlplane.sh | 29 ------------ tools/gate/config_build_ephemeral_iso.yaml | 15 ------- tools/gate/config_cluster_init.yaml | 15 ------- tools/gate/config_deploy_ephemeral_node.yaml | 15 ------- tools/gate/config_phase_apply_initinfra.yaml | 15 ------- tools/gate/config_phase_controlplane.yaml | 15 ------- tools/gate/config_systemwide_executable.yaml | 15 ------- tools/gate/config_template.yaml | 1 - tools/gate/config_test_configs.yaml | 15 ------- 21 files changed, 16 insertions(+), 372 deletions(-) delete mode 100644 playbooks/airship-airshipctl-test-runner.yaml rename tools/gate/{20_run_test_runner.sh => 20_run_gate_runner.sh} (95%) delete mode 100755 tools/gate/21_systemwide_executable.sh delete mode 100755 tools/gate/22_test_configs.sh delete mode 100755 tools/gate/23_build_ephemeral_iso.sh delete mode 100755 tools/gate/25_deploy_ephemeral_node.sh delete mode 100755 tools/gate/27_phase_apply_initinfra.sh delete mode 100755 tools/gate/29_cluster_init.sh delete mode 100755 tools/gate/30_phase_controlplane.sh delete mode 100644 tools/gate/config_build_ephemeral_iso.yaml delete mode 100644 tools/gate/config_cluster_init.yaml delete mode 100644 tools/gate/config_deploy_ephemeral_node.yaml delete mode 100644 tools/gate/config_phase_apply_initinfra.yaml delete mode 100644 tools/gate/config_phase_controlplane.yaml delete mode 100644 tools/gate/config_systemwide_executable.yaml delete mode 100644 tools/gate/config_test_configs.yaml diff --git a/docs/source/developers.md b/docs/source/developers.md index 04ed74d05..b5f825c4e 100644 --- a/docs/source/developers.md +++ b/docs/source/developers.md @@ -11,11 +11,11 @@ airshipctl. ### Installing Git -Instructions to install Git are [here][12]. +Instructions to install Git are [here][11]. ### Installing Go 1.13 -Instructions to install Golang are [here][13]. +Instructions to install Golang are [here][12]. The `make test` verification step requires the GNU Compiler Collection (gcc) to be installed. @@ -92,7 +92,7 @@ There is a script in the airshipctl directory named `00_setup.sh` which can be run to download all the required binaries and packages. This script code can be viewed [here][1]. -Standalone instructions to install Docker are [here][14]. This is not necessary +Standalone instructions to install Docker are [here][13]. This is not necessary if you run `00_setup.sh`. ## Building airshipctl @@ -205,10 +205,9 @@ In order to ensure that all package unit tests follow the same standard and use the same frameworks, airshipctl has a document outlining [specific test guidelines][9] maintained separately. Moreover, there are few scripts in directory `tools/gate` which run different -tests. The script [20_run_test_runner.sh][10] will generate airshipctl config -file and verify cluster and kubectl version. The script -[22_test_config.sh][11] will generate kube config, set airshipctl config and -verify the cluster. +tests. The script [20_run_gate_runner.sh][10] will generate airshipctl config +file, deploy ephemeral cluster with infra and cluster API, deploy target cluster +and verify all control pods. [1]: https://github.com/airshipit/airshipctl/blob/master/tools/gate/00_setup.sh [2]: https://quay.io/airshipit/airshipctl @@ -219,8 +218,7 @@ verify the cluster. [7]: https://golang.org/doc/effective_go.html#formatting [8]: https://github.com/golang/go/wiki/CodeReviewComments [9]: https://github.com/airshipit/airshipctl/blob/master/docs/source/testing-guidelines.md -[10]: https://github.com/airshipit/airshipctl/blob/master/tools/gate/20_run_test_runner.sh -[11]: https://github.com/airshipit/airshipctl/blob/master/tools/gate/22_test_configs.sh -[12]: https://git-scm.com/book/en/v2/Getting-Started-Installing-Git -[13]: https://golang.org/doc/install -[14]: https://docs.docker.com/get-docker/ +[10]: https://github.com/airshipit/airshipctl/blob/master/tools/gate/20_run_gate_runner.sh +[11]: https://git-scm.com/book/en/v2/Getting-Started-Installing-Git +[12]: https://golang.org/doc/install +[13]: https://docs.docker.com/get-docker/ diff --git a/playbooks/airship-airshipctl-test-runner.yaml b/playbooks/airship-airshipctl-test-runner.yaml deleted file mode 100644 index 118cce9ea..000000000 --- a/playbooks/airship-airshipctl-test-runner.yaml +++ /dev/null @@ -1,45 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- hosts: primary - tasks: - - - name: set default roles - set_fact: - test_roles_default: - - airshipctl-systemwide-executable - - airshipctl-test-configs - - airshipctl-pull-docs - - airshipctl-build-ephemeral-iso - - install-kubectl - - airshipctl-deploy-ephemeral-node - - airshipctl-cluster-init-ephemeral - - airshipctl-phase-apply-initinfra - - airshipctl-phase-controlplane - var_files_default: - - local-dev.yaml - - airship-ipam.yaml - - test-config.yaml - - - name: read test variables - include_vars: - file: "vars/{{ var_file }}" - with_items: "{{ var_files | default(var_files_default) }}" - loop_control: - loop_var: var_file - - - name: run test roles - include_role: - name: "{{ role_name }}" - with_items: "{{ test_roles | default(test_roles_default) }}" - loop_control: - loop_var: role_name diff --git a/playbooks/airshipctl-gate-runner.yaml b/playbooks/airshipctl-gate-runner.yaml index f3f205f41..fe95d0e4c 100644 --- a/playbooks/airshipctl-gate-runner.yaml +++ b/playbooks/airshipctl-gate-runner.yaml @@ -22,6 +22,7 @@ - ./tools/deployment/24_build_ephemeral_iso.sh - ./tools/deployment/25_deploy_ephemeral_node.sh - ./tools/deployment/26_deploy_metal3_capi_ephemeral_node.sh + - ./tools/deployment/30_deploy_controlplane.sh - name: "Run gate scripts" include_role: diff --git a/roles/airshipctl-run-script/tasks/main.yaml b/roles/airshipctl-run-script/tasks/main.yaml index 9daccbfa9..24166b6c8 100644 --- a/roles/airshipctl-run-script/tasks/main.yaml +++ b/roles/airshipctl-run-script/tasks/main.yaml @@ -16,6 +16,7 @@ {{ gate_script_path }} args: chdir: "{{ zuul.project.src_dir }}" + vars: + default_zuul_dir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}" environment: - remote_work_dir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" + AIRSHIP_CONFIG_MANIFEST_DIRECTORY: "{{ remote_work_dir | default(local_src_dir) | default(default_zuul_dir) }}" diff --git a/tools/deployment/22_test_configs.sh b/tools/deployment/22_test_configs.sh index 0a5444b2f..1a472cdaf 100755 --- a/tools/deployment/22_test_configs.sh +++ b/tools/deployment/22_test_configs.sh @@ -22,7 +22,6 @@ export USE_PROXY=${USE_PROXY:-"false"} export HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy}} export HTTPS_PROXY=${HTTP_PROXY:-${http_proxy}} export NO_PROXY=${NO_PROXY:-${no_proxy}} -export REMOTE_WORK_DIR=${remote_work_dir:-"/tmp/airship"} export AIRSHIP_CONFIG_ISO_GEN_TARGET_PATH=${ISO_DIR} export AIRSHIP_CONFIG_ISO_BUILDER_DOCKER_IMAGE=${BUILDER_IMAGE:-"quay.io/airshipit/isogen:latest-debian_stable"} export REMOTE_TYPE=redfish @@ -37,7 +36,7 @@ export AIRSHIP_CONFIG_PRIMARY_REPO_BRANCH=${BRANCH:-"master"} # the git repo url or local file system path to a cloned repo, e.g., /home/stack/airshipctl export AIRSHIP_CONFIG_PRIMARY_REPO_URL=${REPO:-"https://review.opendev.org/airship/airshipctl"} export AIRSHIP_SITE_NAME="manifests/site/test-site" -export AIRSHIP_CONFIG_MANIFEST_DIRECTORY=${remote_work_dir} +export AIRSHIP_CONFIG_MANIFEST_DIRECTORY=${AIRSHIP_CONFIG_MANIFEST_DIRECTORY:-"/tmp/airship"} export AIRSHIP_CONFIG_CA_DATA=$(cat tools/deployment/certificates/airship_config_ca_data| base64 -w0) export AIRSHIP_CONFIG_EPHEMERAL_IP=${IP_Ephemeral:-"10.23.25.101"} export AIRSHIP_CONFIG_CLIENT_CERT_DATA=$(cat tools/deployment/certificates/airship_config_client_cert_data| base64 -w0) diff --git a/tools/gate/20_run_test_runner.sh b/tools/gate/20_run_gate_runner.sh similarity index 95% rename from tools/gate/20_run_test_runner.sh rename to tools/gate/20_run_gate_runner.sh index 3daeb15b5..8522426df 100755 --- a/tools/gate/20_run_test_runner.sh +++ b/tools/gate/20_run_gate_runner.sh @@ -25,5 +25,5 @@ PLAYBOOK_CONFIG=${PLAYBOOK_CONFIG:-"${TMP_DIR}/config.yaml"} export AIRSHIPCTL_WS=${AIRSHIPCTL_WS:-$PWD} sudo --preserve-env=AIRSHIPCTL_WS ansible-playbook -i "$ANSIBLE_HOSTS" \ - playbooks/airship-airshipctl-test-runner.yaml \ + playbooks/airshipctl-gate-runner.yaml \ -e @"$PLAYBOOK_CONFIG" diff --git a/tools/gate/21_systemwide_executable.sh b/tools/gate/21_systemwide_executable.sh deleted file mode 100755 index 5f4068fda..000000000 --- a/tools/gate/21_systemwide_executable.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -xe - -TMP_DIR=${TMP_DIR:-"$(dirname $(mktemp -u))"} -ANSIBLE_HOSTS=${ANSIBLE_HOSTS:-"${TMP_DIR}/ansible_hosts"} -PLAYBOOK_CONFIG=${PLAYBOOK_CONFIG:-"${TMP_DIR}/config.yaml"} - -sudo ansible-playbook -i "$ANSIBLE_HOSTS" \ - playbooks/airship-airshipctl-test-runner.yaml \ - -e @tools/gate/config_systemwide_executable.yaml \ - -e @"$PLAYBOOK_CONFIG" diff --git a/tools/gate/22_test_configs.sh b/tools/gate/22_test_configs.sh deleted file mode 100755 index 6755294aa..000000000 --- a/tools/gate/22_test_configs.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -xe - -TMP_DIR=${TMP_DIR:-"$(dirname $(mktemp -u))"} -ANSIBLE_HOSTS=${ANSIBLE_HOSTS:-"${TMP_DIR}/ansible_hosts"} -PLAYBOOK_CONFIG=${PLAYBOOK_CONFIG:-"${TMP_DIR}/config.yaml"} -export AIRSHIPCTL_WS=${AIRSHIPCTL_WS:-$PWD} - -sudo --preserve-env=AIRSHIPCTL_WS ansible-playbook -i "$ANSIBLE_HOSTS" \ - playbooks/airship-airshipctl-test-runner.yaml \ - -e @tools/gate/config_test_configs.yaml \ - -e @"$PLAYBOOK_CONFIG" diff --git a/tools/gate/23_build_ephemeral_iso.sh b/tools/gate/23_build_ephemeral_iso.sh deleted file mode 100755 index 8c2b8bfc8..000000000 --- a/tools/gate/23_build_ephemeral_iso.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -xe - -TMP_DIR=${TMP_DIR:-"$(dirname $(mktemp -u))"} -ANSIBLE_HOSTS=${ANSIBLE_HOSTS:-"${TMP_DIR}/ansible_hosts"} -PLAYBOOK_CONFIG=${PLAYBOOK_CONFIG:-"${TMP_DIR}/config.yaml"} - -sudo ansible-playbook -i "$ANSIBLE_HOSTS" \ - playbooks/airship-airshipctl-test-runner.yaml \ - -e @tools/gate/config_build_ephemeral_iso.yaml \ - -e @"$PLAYBOOK_CONFIG" diff --git a/tools/gate/25_deploy_ephemeral_node.sh b/tools/gate/25_deploy_ephemeral_node.sh deleted file mode 100755 index e5c618b0c..000000000 --- a/tools/gate/25_deploy_ephemeral_node.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -xe - -TMP_DIR=${TMP_DIR:-"$(dirname $(mktemp -u))"} -ANSIBLE_HOSTS=${ANSIBLE_HOSTS:-"${TMP_DIR}/ansible_hosts"} -PLAYBOOK_CONFIG=${PLAYBOOK_CONFIG:-"${TMP_DIR}/config.yaml"} - -sudo ansible-playbook -i "$ANSIBLE_HOSTS" \ - playbooks/airship-airshipctl-test-runner.yaml \ - -e @tools/gate/config_deploy_ephemeral_node.yaml \ - -e @"$PLAYBOOK_CONFIG" diff --git a/tools/gate/27_phase_apply_initinfra.sh b/tools/gate/27_phase_apply_initinfra.sh deleted file mode 100755 index d5f351d94..000000000 --- a/tools/gate/27_phase_apply_initinfra.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -xe - -TMP_DIR=${TMP_DIR:-"$(dirname $(mktemp -u))"} -ANSIBLE_HOSTS=${ANSIBLE_HOSTS:-"${TMP_DIR}/ansible_hosts"} -PLAYBOOK_CONFIG=${PLAYBOOK_CONFIG:-"${TMP_DIR}/config.yaml"} - -sudo ansible-playbook -i "$ANSIBLE_HOSTS" \ - playbooks/airship-airshipctl-test-runner.yaml \ - -e @tools/gate/config_phase_apply_initinfra.yaml \ - -e @"$PLAYBOOK_CONFIG" diff --git a/tools/gate/29_cluster_init.sh b/tools/gate/29_cluster_init.sh deleted file mode 100755 index a7b10e85f..000000000 --- a/tools/gate/29_cluster_init.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -xe - -TMP_DIR=${TMP_DIR:-"$(dirname $(mktemp -u))"} -ANSIBLE_HOSTS=${ANSIBLE_HOSTS:-"${TMP_DIR}/ansible_hosts"} -PLAYBOOK_CONFIG=${PLAYBOOK_CONFIG:-"${TMP_DIR}/config.yaml"} - -sudo ansible-playbook -i "$ANSIBLE_HOSTS" \ - playbooks/airship-airshipctl-test-runner.yaml \ - -e @tools/gate/config_cluster_init.yaml \ - -e @"$PLAYBOOK_CONFIG" diff --git a/tools/gate/30_phase_controlplane.sh b/tools/gate/30_phase_controlplane.sh deleted file mode 100755 index 25f10c2f5..000000000 --- a/tools/gate/30_phase_controlplane.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -xe - -TMP_DIR=${TMP_DIR:-"$(dirname $(mktemp -u))"} -ANSIBLE_HOSTS=${ANSIBLE_HOSTS:-"${TMP_DIR}/ansible_hosts"} -PLAYBOOK_CONFIG=${PLAYBOOK_CONFIG:-"${TMP_DIR}/config.yaml"} - -sudo ansible-playbook -i "$ANSIBLE_HOSTS" \ - playbooks/airship-airshipctl-test-runner.yaml \ - -e @tools/gate/config_phase_controlplane.yaml \ - -e @"$PLAYBOOK_CONFIG" diff --git a/tools/gate/config_build_ephemeral_iso.yaml b/tools/gate/config_build_ephemeral_iso.yaml deleted file mode 100644 index 1973bfa15..000000000 --- a/tools/gate/config_build_ephemeral_iso.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - ---- -test_roles: - - airshipctl-build-ephemeral-iso \ No newline at end of file diff --git a/tools/gate/config_cluster_init.yaml b/tools/gate/config_cluster_init.yaml deleted file mode 100644 index a8e0814f3..000000000 --- a/tools/gate/config_cluster_init.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - ---- -test_roles: - - airshipctl-cluster-init-ephemeral diff --git a/tools/gate/config_deploy_ephemeral_node.yaml b/tools/gate/config_deploy_ephemeral_node.yaml deleted file mode 100644 index 166f7fefa..000000000 --- a/tools/gate/config_deploy_ephemeral_node.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - ---- -test_roles: - - airshipctl-deploy-ephemeral-node \ No newline at end of file diff --git a/tools/gate/config_phase_apply_initinfra.yaml b/tools/gate/config_phase_apply_initinfra.yaml deleted file mode 100644 index eb00a1af1..000000000 --- a/tools/gate/config_phase_apply_initinfra.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - ---- -test_roles: - - airshipctl-phase-apply-initinfra diff --git a/tools/gate/config_phase_controlplane.yaml b/tools/gate/config_phase_controlplane.yaml deleted file mode 100644 index 5313f0fed..000000000 --- a/tools/gate/config_phase_controlplane.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - ---- -test_roles: - - airshipctl-phase-controlplane diff --git a/tools/gate/config_systemwide_executable.yaml b/tools/gate/config_systemwide_executable.yaml deleted file mode 100644 index dbfc567ee..000000000 --- a/tools/gate/config_systemwide_executable.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - ---- -test_roles: - - airshipctl-systemwide-executable diff --git a/tools/gate/config_template.yaml b/tools/gate/config_template.yaml index 28517fac9..e73134b3f 100644 --- a/tools/gate/config_template.yaml +++ b/tools/gate/config_template.yaml @@ -28,4 +28,3 @@ proxy: http: "$HTTP_PROXY" https: "$HTTPS_PROXY" noproxy: "$NO_PROXY" -#remote_work_dir: "/tmp/airship" diff --git a/tools/gate/config_test_configs.yaml b/tools/gate/config_test_configs.yaml deleted file mode 100644 index 138385561..000000000 --- a/tools/gate/config_test_configs.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - ---- -test_roles: - - airshipctl-test-configs