The IEC usecase job (e.g. seba-on-arm installation) parameters should
be installer specific and OS specific, e.g. Ubuntu deployed using Fuel
defaults to 'ubuntu' user, while CentOS deployed using Fuel defaults
to 'centos'.
While at it, unify currently separate parameters for the SSH
credentials in Fuel/Compass installations and fix the IEC dir location
for Fuel.
Change-Id: I93613aacc41eb8a2cfd1662b7d76ade36c7c8090
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| awk '{print $1}')
# On Fuel deployements the K8s ssh key is the one used by the deploy job
K8S_SSH_KEY=${SSH_KEY}
| awk '{print $1}')
# On Fuel deployements the K8s ssh key is the one used by the deploy job
K8S_SSH_KEY=${SSH_KEY}
- IEC_DIR="/home/${K8S_SSH_USER}/iec"
+ IEC_DIR="/var/lib/akraino/iec"
- K8S_MASTER_IP=${K8S_MASTER_IP_COMPASS}
- K8S_SSH_USER=${K8S_SSH_USER_COMPASS}
- K8S_SSH_PASSWORD=${K8S_SSH_PASSWORD_COMPASS}
- IEC_DIR="/${K8S_SSH_USER_COMPASS}/iec"
+ # K8S_{MASTER_IP,SSH_USER,SSH_PASSWORD} are already set by job params
+ IEC_DIR="/${K8S_SSH_USER}/iec"
;;
*)
echo "Cannot determine installer from ${JOB_NAME}"
;;
*)
echo "Cannot determine installer from ${JOB_NAME}"
name: ARCHIVE_ARTIFACTS
default: '**/*.log'
description: Artifacts to archive to the logs server.
name: ARCHIVE_ARTIFACTS
default: '**/*.log'
description: Artifacts to archive to the logs server.
-- parameter:
- name: 'seba_on_arm-defaults'
+# Usecase params are both installer and OS specific
+- parameter: &k8s_fuel_ubuntu1604_parameter
+ name: 'seba_on_arm-fuel-ubuntu1604-defaults'
+ - string: &k8s_master_ip
+ name: K8S_MASTER_IP
+ default: ''
+ description: 'IP address to connect to the K8s master'
+ - string: &k8s_ssh_user
name: K8S_SSH_USER
default: 'ubuntu'
description: 'SSH username to connect to the K8s master '
name: K8S_SSH_USER
default: 'ubuntu'
description: 'SSH username to connect to the K8s master '
+ - string: &k8s_ssh_password
name: K8S_SSH_PASSWORD
default: ''
description: 'SSH password to connect to the K8s master'
name: K8S_SSH_PASSWORD
default: ''
description: 'SSH password to connect to the K8s master'
name: K8S_SSH_KEY
default: ''
description: 'SSH key to connect to the K8s master'
name: K8S_SSH_KEY
default: ''
description: 'SSH key to connect to the K8s master'
+- parameter:
+ <<: *k8s_fuel_ubuntu1604_parameter
+ name: 'seba_on_arm-fuel-ubuntu1804-defaults'
+- parameter:
+ name: 'seba_on_arm-fuel-centos7-defaults'
+ parameters:
- name: K8S_MASTER_IP_COMPASS
+ <<: *k8s_master_ip
+ - string:
+ <<: *k8s_ssh_user
+ default: 'centos'
+ - string:
+ <<: *k8s_ssh_password
+ - string:
+ <<: *k8s_ssh_key
+- parameter:
+ name: 'seba_on_arm-compass-ubuntu1604-defaults'
+ parameters:
+ - string:
+ <<: *k8s_master_ip
- description: 'IP address to compass connect to the K8s master'
- name: K8S_SSH_PASSWORD_COMPASS
- description: 'SSH password to compass connect to the K8s master'
- name: K8S_SSH_USER_COMPASS
- description: 'SSH username to compass connect to the K8s master'
+ - string:
+ <<: *k8s_ssh_key
########################
# job templates
########################
# job templates
stream: '{stream}'
branch: '{branch}'
- '{project}-defaults'
stream: '{stream}'
branch: '{branch}'
- '{project}-defaults'
+ - '{usecase}-{installer}-{os}-defaults'