airship
/
airshipctl
Code Issues Proposed changes

Add multi-site support to gate runner 

This change adds multi-site support to the gate runner by leveraging
environment variables used by the deployment scripts. Zuul jobs can
change the site by defining the site variable in the job definition. If
no site name is specified, test-site is used as a default.

Example:

  - job:
      name: gate-script-runner-site-b
      vars:
        site: site-b

This change will allow the treasuremap repository to test multiple sites
using the same job definitions.

Change-Id: I5ed02d2563db2d2b3b1587fcac94ad2bce805ced
Signed-off-by: Drew Walters <andrew.walters@att.com>
This commit is contained in:
Drew Walters 2020-08-17 14:03:51 +00:00
parent 51e027be7d
commit 0706575ef4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/airshipctl-run-script/tasks/main.yaml
View File

@ -20,3 +20,5 @@
default_zuul_dir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
environment:
AIRSHIP_CONFIG_MANIFEST_DIRECTORY: "{{ remote_work_dir | default(local_src_dir) | default(default_zuul_dir) }}"
AIRSHIP_SITE_NAME: "manifests/site/{{ site | default('test-site') }}"
SITE_NAME: "{{ site | default('test-site') }}"

2
tools/deployment/22_test_configs.sh
View File

@ -35,7 +35,7 @@ export SYSTEM_REBOOT_DELAY=30
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_SITE_NAME=${AIRSHIP_SITE_NAME:-"manifests/site/test-site"}
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"}