Pinning airshipctl version in treasuremap
* Treasuremap is dependant on airshipctl repo. So pinning the last good tested version of airshipctl in treasuremap Change-Id: I6923da9871b946134fbdc285c38bcb8f967aa804 Relates-To: #100
This commit is contained in:
parent
43f8dab09a
commit
27d31a22f7
@ -57,7 +57,7 @@
|
|||||||
state: absent
|
state: absent
|
||||||
when: remote_work_dir is defined
|
when: remote_work_dir is defined
|
||||||
- name: clone document model
|
- name: clone document model
|
||||||
command: git clone -q {{ airship_config_primary_repo_url }} {{ remote_work_dir }}
|
command: git clone -q {{ airship_config_phase_repo_url }} {{ remote_work_dir }}
|
||||||
when: remote_work_dir is defined
|
when: remote_work_dir is defined
|
||||||
- name: get VM config(MACs and bootMode) from BareMetalHost objects
|
- name: get VM config(MACs and bootMode) from BareMetalHost objects
|
||||||
include_tasks:
|
include_tasks:
|
||||||
@ -87,15 +87,16 @@
|
|||||||
disk_format: qcow2
|
disk_format: qcow2
|
||||||
ephemeral_disk_size: 20G
|
ephemeral_disk_size: 20G
|
||||||
ephemeral_vm_cfg: "{{ ephemeral_vm_cfg }}"
|
ephemeral_vm_cfg: "{{ ephemeral_vm_cfg }}"
|
||||||
ephemeral_vm_memory_mb: 6124
|
ephemeral_vm_memory_mb: 6144
|
||||||
ephemeral_vm_vcpus: 4
|
ephemeral_vm_vcpus: 4
|
||||||
target_disk_size: 20G
|
target_disk_size: 20G
|
||||||
target_vm_cfg: "{{ target_vm_cfg }}"
|
target_vm_cfg: "{{ target_vm_cfg }}"
|
||||||
target_vm_memory_mb: 6124
|
target_vm_memory_mb: 7168
|
||||||
target_vm_vcpus: 2
|
target_vm_vcpus: 2
|
||||||
target_vms_count: 1
|
target_vms_count: 1
|
||||||
worker_disk_size: 20G
|
worker_disk_size: 20G
|
||||||
worker_vm_memory_mb: 6124
|
worker_vm_cfg: "{{ worker_vm_cfg }}"
|
||||||
|
worker_vm_memory_mb: 7168
|
||||||
worker_vm_vcpus: 2
|
worker_vm_vcpus: 2
|
||||||
worker_vms_count: 1
|
worker_vms_count: 1
|
||||||
airship_gate_file_exchanger:
|
airship_gate_file_exchanger:
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
environment:
|
environment:
|
||||||
SOPS_IMPORT_PGP: "{{ airship_config_pgp }}"
|
SOPS_IMPORT_PGP: "{{ airship_config_pgp }}"
|
||||||
SOPS_PGP_FP: "{{ airship_config_pgp_fp }}"
|
SOPS_PGP_FP: "{{ airship_config_pgp_fp }}"
|
||||||
|
AIRSHIPCTL_REF: "681f8547c989e862d155f2e9f2c794c89326d931"
|
||||||
tasks:
|
tasks:
|
||||||
- name: "set default gate scripts"
|
- name: "set default gate scripts"
|
||||||
set_fact:
|
set_fact:
|
||||||
|
@ -21,7 +21,7 @@ export AIRSHIP_SITE_NAME=${AIRSHIP_SITE_NAME:-"test-site"}
|
|||||||
export AIRSHIP_CONFIG_METADATA_PATH=${AIRSHIP_CONFIG_METADATA_PATH:-"treasuremap/manifests/site/$AIRSHIP_SITE_NAME/metadata.yaml"}
|
export AIRSHIP_CONFIG_METADATA_PATH=${AIRSHIP_CONFIG_METADATA_PATH:-"treasuremap/manifests/site/$AIRSHIP_SITE_NAME/metadata.yaml"}
|
||||||
|
|
||||||
# Primary repo options
|
# Primary repo options
|
||||||
export AIRSHIP_CONFIG_PRIMARY_REPO_URL=${AIRSHIP_CONFIG_PRIMARY_REPO_URL:-"${TREASUREMAP_PROJECT}"}
|
export AIRSHIP_CONFIG_PHASE_REPO_URL=${AIRSHIP_CONFIG_PHASE_REPO_URL:-"${TREASUREMAP_PROJECT}"}
|
||||||
export AIRSHIPCTL_REPO_URL=${AIRSHIPCTL_REPO_URL:-"https://opendev.org/airship/airshipctl.git"}
|
export AIRSHIPCTL_REPO_URL=${AIRSHIPCTL_REPO_URL:-"https://opendev.org/airship/airshipctl.git"}
|
||||||
export TREASUREMAP_REF=${TREASUREMAP_REF:-"$(git rev-parse HEAD)"}
|
export TREASUREMAP_REF=${TREASUREMAP_REF:-"$(git rev-parse HEAD)"}
|
||||||
|
|
||||||
@ -40,7 +40,7 @@ airshipctl config set-manifest treasuremap_ci \
|
|||||||
|
|
||||||
airshipctl config set-manifest treasuremap_ci \
|
airshipctl config set-manifest treasuremap_ci \
|
||||||
--repo primary \
|
--repo primary \
|
||||||
--url "${AIRSHIP_CONFIG_PRIMARY_REPO_URL}" \
|
--url "${AIRSHIP_CONFIG_PHASE_REPO_URL}" \
|
||||||
--commithash "${TREASUREMAP_REF}"
|
--commithash "${TREASUREMAP_REF}"
|
||||||
|
|
||||||
airshipctl config set-context ephemeral-cluster --manifest treasuremap_ci
|
airshipctl config set-context ephemeral-cluster --manifest treasuremap_ci
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
set -xe
|
set -xe
|
||||||
|
|
||||||
: ${AIRSHIPCTL_PROJECT:="../airshipctl"}
|
: ${AIRSHIPCTL_PROJECT:="../airshipctl"}
|
||||||
: ${MANIFEST_ROOT:="$(dirname "${PWD}")"}
|
: ${MANIFEST_ROOT:="/tmp/default"}
|
||||||
: ${SITE_ROOTS:="$(basename "${PWD}")/manifests/site"}
|
: ${SITE_ROOTS:="$(basename "${PWD}")/manifests/site"}
|
||||||
: ${MANIFEST_REPO_URL:="https://review.opendev.org/airship/treasuremap"}
|
: ${MANIFEST_REPO_URL:="https://review.opendev.org/airship/treasuremap"}
|
||||||
export MANIFEST_ROOT=$MANIFEST_ROOT
|
export MANIFEST_ROOT=$MANIFEST_ROOT
|
||||||
|
@ -35,6 +35,7 @@
|
|||||||
- ./tools/deployment/01_install_kubectl.sh
|
- ./tools/deployment/01_install_kubectl.sh
|
||||||
- ./tools/deployment/21_systemwide_executable.sh
|
- ./tools/deployment/21_systemwide_executable.sh
|
||||||
- ./tools/deployment/22_test_configs.sh
|
- ./tools/deployment/22_test_configs.sh
|
||||||
|
- ./tools/deployment/23_pull_documents.sh
|
||||||
- ./tools/validate_docs
|
- ./tools/validate_docs
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
|
Loading…
Reference in New Issue
Block a user