diff options
| -rwxr-xr-x | build/build_nexus_blob.sh | 8 | ||||
| -rw-r--r-- | build/data_lists/onap_pip_packages.list | 10 | ||||
| -rw-r--r-- | tools/cicdansible/roles/install/tasks/install.yml | 2 | ||||
| -rw-r--r-- | tools/cicdansible/roles/install/templates/inventory.yml.j2 | 6 |
4 files changed, 16 insertions, 10 deletions
diff --git a/build/build_nexus_blob.sh b/build/build_nexus_blob.sh index 51ab05e7..f964bf9d 100755 --- a/build/build_nexus_blob.sh +++ b/build/build_nexus_blob.sh @@ -333,7 +333,13 @@ chown 200:200 ${NEXUS_DATA_DIR} chmod 777 ${NEXUS_DATA_DIR} # Save Nexus version to prevent/catch data incompatibility -docker images --no-trunc | grep sonatype/nexus3 | awk '{ print $1":"$2" "$3}' > ${NEXUS_DATA_DIR}/nexus.ver +# Adding commit informations to have link to data from which the blob was built +cat >> ${NEXUS_DATA_DIR}/nexus.ver << INFO +nexus_image=$(docker image ls ${NEXUS_IMAGE} --no-trunc --format "{{.Repository}}:{{.Tag}}\nnexus_image_digest={{.ID}}") +$(for INDEX in ${!NXS_DOCKER_IMG_LISTS[@]}; do printf 'used_image_list%s=%s\n' "$INDEX" "$(sed 's/^.*\/\(.*\)$/\1/' <<< ${NXS_DOCKER_IMG_LISTS[$INDEX]})"; done) +$(sed -n 's/^.*OOM\ commit\ /oom_repo_commit=/p' ${NXS_DOCKER_IMG_LISTS[@]}) +installer_repo_commit=$(git --git-dir="${LOCAL_PATH}/../.git" rev-parse HEAD) +INFO # Start the Nexus NEXUS_CONT_ID=$(docker run -d --rm -v ${NEXUS_DATA_DIR}:/nexus-data:rw --name ${NEXUS_DOMAIN} ${PUBLISHED_PORTS} ${NEXUS_IMAGE}) diff --git a/build/data_lists/onap_pip_packages.list b/build/data_lists/onap_pip_packages.list index 48029bc2..7d9f826f 100644 --- a/build/data_lists/onap_pip_packages.list +++ b/build/data_lists/onap_pip_packages.list @@ -1,11 +1,11 @@ Click==7.0 -certifi==2019.3.9 +certifi==2019.9.11 chardet==3.0.4 -Flask==1.0.3 +Flask==1.1.1 idna==2.8 itsdangerous==1.1.0 Jinja2==2.10.1 -MarkupSafe==0.23 +MarkupSafe==1.1.1 requests==2.22.0 -urllib3==1.25.3 -Werkzeug==0.15.4 +urllib3==1.25.6 +Werkzeug==0.16.0 diff --git a/tools/cicdansible/roles/install/tasks/install.yml b/tools/cicdansible/roles/install/tasks/install.yml index 35df7976..141ea7ae 100644 --- a/tools/cicdansible/roles/install/tasks/install.yml +++ b/tools/cicdansible/roles/install/tasks/install.yml @@ -45,4 +45,4 @@ args: chdir: "{{ installer_deploy_path }}/ansible" async: "{{ install_timeout }}" - when: install_app + when: install_app | bool diff --git a/tools/cicdansible/roles/install/templates/inventory.yml.j2 b/tools/cicdansible/roles/install/templates/inventory.yml.j2 index c828ca00..faec5903 100644 --- a/tools/cicdansible/roles/install/templates/inventory.yml.j2 +++ b/tools/cicdansible/roles/install/templates/inventory.yml.j2 @@ -13,7 +13,7 @@ all: ansible_host: {{ resource_host }} infrastructure: hosts: - infra_host: + infra: ansible_host: infra cluster_ip: {{ hostvars['infra'].ansible_default_ipv4.address }} external_ip: "{{ hostvars['infra'].ansible_host }}" @@ -31,10 +31,10 @@ all: {% endfor %} kubernetes-control-plane: hosts: - infra_host + infra kubernetes-etcd: hosts: - infra_host + infra nfs-server: hosts: node0 |