summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ansible/roles/nginx/defaults/main.yml2
-rw-r--r--ansible/roles/package-repository/defaults/main.yml2
-rw-r--r--ansible/roles/package-repository/molecule/default/tests/test_infrastructure-server.py2
-rw-r--r--ansible/roles/package-repository/molecule/default/tests/test_kubernetes-node-1.py2
-rw-r--r--ansible/test/roles/prepare-package-repository/tasks/main.yml10
-rw-r--r--ansible/test/roles/prepare-package-repository/vars/main.yml2
-rwxr-xr-xbuild/build_nexus_blob.sh15
-rwxr-xr-xbuild/create_repo.sh6
-rw-r--r--build/data_lists/onap_docker_images.list263
-rwxr-xr-xbuild/docker-entrypoint.sh4
-rwxr-xr-xbuild/package.py27
11 files changed, 170 insertions, 165 deletions
diff --git a/ansible/roles/nginx/defaults/main.yml b/ansible/roles/nginx/defaults/main.yml
index 8bf44197..c2f1e05c 100644
--- a/ansible/roles/nginx/defaults/main.yml
+++ b/ansible/roles/nginx/defaults/main.yml
@@ -16,7 +16,7 @@ nginx:
- "{{ app_data_path }}/certs:/etc/nginx/certs:ro"
- "{{ app_data_path }}/git-repo:/srv/git:rw"
- "{{ app_data_path }}/http:/srv/http:rw"
- - "{{ app_data_path }}/pkg/rhel:/srv/http/repo.infra-server/rhel:rw"
+ - "{{ app_data_path }}/pkg/rpm:/srv/http/repo.infra-server/rpm:rw"
- "{{ app_data_path }}/pkg/ubuntu/xenial:/srv/http/repo.infra-server/ubuntu/xenial:rw"
- /var/log/nginx:/var/log/nginx:rw
# Default rule for tarball naming translation
diff --git a/ansible/roles/package-repository/defaults/main.yml b/ansible/roles/package-repository/defaults/main.yml
index 678b6bd4..0557eda3 100644
--- a/ansible/roles/package-repository/defaults/main.yml
+++ b/ansible/roles/package-repository/defaults/main.yml
@@ -3,6 +3,6 @@ package_repositories:
- name: "{{ app_name }}"
file: "{{ app_name | lower }}"
description: "{{ app_name | upper }} offline repository"
- baseurl: "{{ 'http://repo.infra-server/rhel' if 'infrastructure' not in group_names else 'file://' + app_data_path + '/pkg/rhel' }}"
+ baseurl: "{{ 'http://repo.infra-server/rpm' if 'infrastructure' not in group_names else 'file://' + app_data_path + '/pkg/rpm' }}"
gpgcheck: false
enabled: true
diff --git a/ansible/roles/package-repository/molecule/default/tests/test_infrastructure-server.py b/ansible/roles/package-repository/molecule/default/tests/test_infrastructure-server.py
index 63588e26..9fb1a4f9 100644
--- a/ansible/roles/package-repository/molecule/default/tests/test_infrastructure-server.py
+++ b/ansible/roles/package-repository/molecule/default/tests/test_infrastructure-server.py
@@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
def test_onap_repo(host):
fc = host.file('/etc/yum.repos.d/moleculetestapp.repo').content_string
expected_content = """[moleculetestapp]
-baseurl = file:///opt/moleculetestapp/pkg/rhel
+baseurl = file:///opt/moleculetestapp/pkg/rpm
enabled = 1
gpgcheck = 0
name = MOLECULETESTAPP offline repository"""
diff --git a/ansible/roles/package-repository/molecule/default/tests/test_kubernetes-node-1.py b/ansible/roles/package-repository/molecule/default/tests/test_kubernetes-node-1.py
index eab7d065..fda85e8d 100644
--- a/ansible/roles/package-repository/molecule/default/tests/test_kubernetes-node-1.py
+++ b/ansible/roles/package-repository/molecule/default/tests/test_kubernetes-node-1.py
@@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
def test_onap_repo(host):
fc = host.file('/etc/yum.repos.d/moleculetestapp.repo').content_string
expected_content = """[moleculetestapp]
-baseurl = http://repo.infra-server/rhel
+baseurl = http://repo.infra-server/rpm
enabled = 1
gpgcheck = 0
name = MOLECULETESTAPP offline repository"""
diff --git a/ansible/test/roles/prepare-package-repository/tasks/main.yml b/ansible/test/roles/prepare-package-repository/tasks/main.yml
index 66f81d6d..983e9766 100644
--- a/ansible/test/roles/prepare-package-repository/tasks/main.yml
+++ b/ansible/test/roles/prepare-package-repository/tasks/main.yml
@@ -12,15 +12,15 @@
name: createrepo
state: present
-- name: "Ensure {{ rhel_pkg_dir }} exists"
+- name: "Ensure {{ pkg_dir }} exists"
file:
- path: "{{ rhel_pkg_dir }}"
+ path: "{{ pkg_dir }}"
state: directory
- name: Download rpm packages
- command: "yumdownloader --destdir={{ rhel_pkg_dir }} --resolve {{ packages | join(' ') }}"
+ command: "yumdownloader --destdir={{ pkg_dir }} --resolve {{ packages | join(' ') }}"
- name: Index repository
- command: "createrepo {{ rhel_pkg_dir }}"
+ command: "createrepo {{ pkg_dir }}"
args:
- creates: "{{ rhel_pkg_dir }}/repodata"
+ creates: "{{ pkg_dir }}/repodata"
diff --git a/ansible/test/roles/prepare-package-repository/vars/main.yml b/ansible/test/roles/prepare-package-repository/vars/main.yml
index 80944284..195ad0f1 100644
--- a/ansible/test/roles/prepare-package-repository/vars/main.yml
+++ b/ansible/test/roles/prepare-package-repository/vars/main.yml
@@ -1,5 +1,5 @@
---
-rhel_pkg_dir: "{{ app_data_path }}/pkg/rhel"
+pkg_dir: "{{ app_data_path }}/pkg/rpm"
packages:
- "docker-ce-18.09.5"
- container-selinux
diff --git a/build/build_nexus_blob.sh b/build/build_nexus_blob.sh
index 72dda540..688410ef 100755
--- a/build/build_nexus_blob.sh
+++ b/build/build_nexus_blob.sh
@@ -212,32 +212,33 @@ push_docker () {
while [ "${1}" != "" ]; do
case ${1} in
-d | --docker ) shift
- NXS_DOCKER_IMG_LISTS+=("${1}")
+ NXS_DOCKER_IMG_LISTS+=("$(realpath ${1})")
;;
-i | --input-directory ) shift
- DATA_DIR="${1}"
+ DATA_DIR="$(realpath ${1})"
;;
-ld | --load-docker-images ) DOCKER_LOAD="true"
;;
-n | --npm ) NPM_PUSH="true"
COMMANDS+=(expect npm)
shift
- NXS_NPM_LISTS+=("${1}")
+ NXS_NPM_LISTS+=("$(realpath ${1})")
;;
-o | --output-directory ) shift
- NEXUS_DATA_DIR="${1}"
+ NEXUS_DATA_DIR="$(realpath ${1})"
;;
-p | --pypi ) PYPI_PUSH="true"
COMMANDS+=(twine)
shift
- NXS_PYPI_LISTS+=("${1}")
+ NXS_PYPI_LISTS+=("$(realpath ${1})")
;;
-rl | --resource-list-directory ) shift
- LISTS_DIR="${1}"
+ LISTS_DIR="$(realpath ${1})"
;;
-h | --help ) usage
;;
*) usage
+ ;;
esac
shift
done
@@ -445,4 +446,4 @@ if [ -f ~/.docker/${DOCKER_CONF_BACKUP} ]; then
fi
echo "Nexus blob is built"
-exit 0 \ No newline at end of file
+exit 0
diff --git a/build/create_repo.sh b/build/create_repo.sh
index b6db6ad2..eaf0ee30 100755
--- a/build/create_repo.sh
+++ b/build/create_repo.sh
@@ -12,7 +12,7 @@ container_repo_volume="/mnt/repo/"
# Docker image name and version
docker_image="centos:centos7.6.1810"
# Expected directory for RPM packages
-expected_dir="resources/pkg/rhel"
+expected_dir="resources/pkg/rpm"
help () {
echo "Script for run docker container with RPM repository"
@@ -56,10 +56,10 @@ do
shift;shift
done
-# Check if path contains expected path "resources/pkg/rhel"
+# Check if path contains expected path "resources/pkg/rpm"
if ! [[ "/$volume_repo_directory/" = *"/$expected_dir/"* ]]; then
# Create repo folder if it not exists
- volume_repo_directory="$volume_repo_directory"/resources/pkg/rhel
+ volume_repo_directory="$volume_repo_directory"/resources/pkg/rpm
[ ! -d "$volume_repo_directory" ] && mkdir -p $volume_repo_directory
fi
diff --git a/build/data_lists/onap_docker_images.list b/build/data_lists/onap_docker_images.list
index c849ac69..d203425c 100644
--- a/build/data_lists/onap_docker_images.list
+++ b/build/data_lists/onap_docker_images.list
@@ -1,13 +1,16 @@
-# generated from OOM commit 106dbc9a0224a3259f1eaf24d4bcc8571ed591ab
+# generated from OOM commit 7fd7493cdb4e5056763de07b7a5c7ee1432de79a
alpine:3.6
+ansible/awx_rabbitmq:3.7.4
+ansible/awx_task:latest
+ansible/awx_web:latest
busybox
crunchydata/crunchy-pgpool:centos7-10.4-2.0.0
crunchydata/crunchy-postgres:centos7-10.3-1.8.2
crunchydata/crunchy-postgres:centos7-10.4-2.0.0
docker.elastic.co/beats/filebeat:5.5.0
docker.elastic.co/elasticsearch/elasticsearch:5.5.0
+docker.elastic.co/elasticsearch/elasticsearch:6.1.2
docker.elastic.co/elasticsearch/elasticsearch:6.6.2
-docker.elastic.co/elasticsearch/elasticsearch-oss:6.6.2
docker.elastic.co/kibana/kibana:5.5.0
docker.elastic.co/kibana/kibana:6.6.2
docker.elastic.co/logstash/logstash:5.4.3
@@ -24,191 +27,185 @@ gcr.io/google_samples/k8szk:v3
k8s.gcr.io/etcd-amd64:3.2.24
library/cassandra:2.2.14
library/mariadb:10
-library/python:3.6-alpine
+memcached:latest
netboxcommunity/netbox:v2.5.8
nexus3.onap.org:10001/adfinissygroup/k8s-mariadb-galera-centos:v002
+nexus3.onap.org:10001/adfinissygroup/k8s-mariadb-galera-centos:v004
nexus3.onap.org:10001/busybox
nexus3.onap.org:10001/library/consul:1.0.6
nexus3.onap.org:10001/library/tomcat:8.5
nexus3.onap.org:10001/library/vault:0.10.0
nexus3.onap.org:10001/mariadb:10.1.38
-nexus3.onap.org:10001/mariadb:10.2.14
+nexus3.onap.org:10001/mariadb:10.2.25
nexus3.onap.org:10001/mariadb:10.3.12
nexus3.onap.org:10001/mariadb:10.3.14
-nexus3.onap.org:10001/onap/aaf/aaf_agent:2.1.13
-nexus3.onap.org:10001/onap/aaf/aaf_cass:2.1.13
-nexus3.onap.org:10001/onap/aaf/aaf_cm:2.1.13
-nexus3.onap.org:10001/onap/aaf/aaf_config:2.1.13
-nexus3.onap.org:10001/onap/aaf/aaf_fs:2.1.13
-nexus3.onap.org:10001/onap/aaf/aaf_gui:2.1.13
-nexus3.onap.org:10001/onap/aaf/aaf_hello:2.1.13
-nexus3.onap.org:10001/onap/aaf/aaf_locate:2.1.13
-nexus3.onap.org:10001/onap/aaf/aaf_oauth:2.1.13
-nexus3.onap.org:10001/onap/aaf/aaf_service:2.1.13
+nexus3.onap.org:10001/onap/aaf/aaf_agent:2.1.15
+nexus3.onap.org:10001/onap/aaf/aaf_cass:2.1.15
+nexus3.onap.org:10001/onap/aaf/aaf_config:2.1.15
+nexus3.onap.org:10001/onap/aaf/aaf_core:2.1.15
+nexus3.onap.org:10001/onap/aaf/aaf_hello:2.1.15
nexus3.onap.org:10001/onap/aaf/distcenter:4.0.0
nexus3.onap.org:10001/onap/aaf/sms:4.0.1
nexus3.onap.org:10001/onap/aaf/smsquorumclient:4.0.0
nexus3.onap.org:10001/onap/aaf/testcaservice:4.0.0
nexus3.onap.org:10001/onap/aai/esr-gui:1.4.0
nexus3.onap.org:10001/onap/aai/esr-server:1.4.0
-nexus3.onap.org:10001/onap/aai-graphadmin:1.1.0
-nexus3.onap.org:10001/onap/aai-resources:1.4.0
-nexus3.onap.org:10001/onap/aai-schema-service:1.0.6
-nexus3.onap.org:10001/onap/aai-traversal:1.4.1
-nexus3.onap.org:10001/onap/admportal-sdnc-image:1.5.4
-nexus3.onap.org:10001/onap/appc-cdt-image:1.5.3
-nexus3.onap.org:10001/onap/appc-image:1.5.3
-nexus3.onap.org:10001/onap/babel:1.4.2
-nexus3.onap.org:10001/onap/ccsdk-ansible-server-image:0.4.2
-nexus3.onap.org:10001/onap/ccsdk-apps-ms-neng:0.4.4
-nexus3.onap.org:10001/onap/ccsdk-blueprintsprocessor:0.4.5
-nexus3.onap.org:10001/onap/ccsdk-cds-ui-server:0.4.5
-nexus3.onap.org:10001/onap/ccsdk-commandexecutor:0.4.5
-nexus3.onap.org:10001/onap/ccsdk-controllerblueprints:0.4.5
-nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:0.4.4
-nexus3.onap.org:10001/onap/ccsdk-sdclistener:0.4.5
-nexus3.onap.org:10001/onap/champ:1.4.0
-nexus3.onap.org:10001/onap/clamp:4.0.5
-nexus3.onap.org:10001/onap/clamp-dashboard-kibana:4.0.5
-nexus3.onap.org:10001/onap/clamp-dashboard-logstash:4.0.5
+nexus3.onap.org:10001/onap/aai-graphadmin:1.5.1
+nexus3.onap.org:10001/onap/aai-graphgraph:1.5
+nexus3.onap.org:10001/onap/aai-resources:1.5.1
+nexus3.onap.org:10001/onap/aai-schema-service:1.5.2
+nexus3.onap.org:10001/onap/aai-traversal:1.5.1
+nexus3.onap.org:10001/onap/admportal-sdnc-image:1.7.4
+nexus3.onap.org:10001/onap/appc-cdt-image:1.6.4
+nexus3.onap.org:10001/onap/appc-image:1.6.4
+nexus3.onap.org:10001/onap/babel:1.5.1
+nexus3.onap.org:10001/onap/ccsdk-ansible-server-image:0.4.4
+nexus3.onap.org:10001/onap/ccsdk-apps-ms-neng:0.6.3
+nexus3.onap.org:10001/onap/ccsdk-blueprintsprocessor:0.6.3
+nexus3.onap.org:10001/onap/ccsdk-cds-ui-server:0.6.3
+nexus3.onap.org:10001/onap/ccsdk-commandexecutor:0.6.3
+nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:0.6.3
+nexus3.onap.org:10001/onap/ccsdk-sdclistener:0.6.3
+nexus3.onap.org:10001/onap/clamp-backend:4.1.3
+nexus3.onap.org:10001/onap/clamp-dashboard-elasticsearch:4.1.1
+nexus3.onap.org:10001/onap/clamp-dashboard-kibana:4.1.3
+nexus3.onap.org:10001/onap/clamp-dashboard-logstash:4.1.3
+nexus3.onap.org:10001/onap/clamp-frontend:4.1.3
nexus3.onap.org:10001/onap/cli:3.0.0
nexus3.onap.org:10001/onap/data-router:1.3.3
-nexus3.onap.org:10001/onap/data-router:1.4.0
-nexus3.onap.org:10001/onap/dcae-be:1.3.0
-nexus3.onap.org:10001/onap/dcae-dt:1.2.0
-nexus3.onap.org:10001/onap/dcae-fe:1.3.0
-nexus3.onap.org:10001/onap/dcae-tools:1.3.0
-nexus3.onap.org:10001/onap/dcae-tosca-app:1.3.0
-nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.1.0
-nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.1.0
+nexus3.onap.org:10001/onap/data-router:1.5.1
+nexus3.onap.org:10001/onap/dcae-be:1.3.2
+nexus3.onap.org:10001/onap/dcae-dt:1.3.2
+nexus3.onap.org:10001/onap/dcae-fe:1.3.2
+nexus3.onap.org:10001/onap/dcae-tools:1.3.2
+nexus3.onap.org:10001/onap/dcae-tosca-app:1.3.1
+nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.1.2
+nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.1.2
nexus3.onap.org:10001/onap/dmaap/dbc-client:1.0.9
nexus3.onap.org:10001/onap/dmaap/dmaap-bc:1.1.5
-nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.14
+nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.16
nexus3.onap.org:10001/onap/dmaap/kafka111:1.0.1
nexus3.onap.org:10001/onap/dmaap/zookeeper:6.0.0
-nexus3.onap.org:10001/onap/elasticsearch-sg:1.4.3
-nexus3.onap.org:10001/onap/externalapi/nbi:4.0.0
-nexus3.onap.org:10001/onap/gizmo:1.4.0
+nexus3.onap.org:10001/onap/externalapi/nbi:5.0.1
nexus3.onap.org:10001/onap/holmes/engine-management:1.2.5
nexus3.onap.org:10001/onap/holmes/rule-management:1.2.6
-nexus3.onap.org:10001/onap/modeling/genericparser:1.0.2
-nexus3.onap.org:10001/onap/model-loader:1.4.0
-nexus3.onap.org:10001/onap/msb/msb_apigateway:1.2.4
-nexus3.onap.org:10001/onap/msb/msb_discovery:1.2.3
+nexus3.onap.org:10001/onap/modeling/etsicatalog:1.0.4
+nexus3.onap.org:10001/onap/model-loader:1.5.1
+nexus3.onap.org:10001/onap/msb/msb_apigateway:1.2.5
+nexus3.onap.org:10001/onap/msb/msb_discovery:1.2.5
nexus3.onap.org:10001/onap/multicloud/azure:1.2.4
-nexus3.onap.org:10001/onap/multicloud/framework:1.3.3
-nexus3.onap.org:10001/onap/multicloud/framework-artifactbroker:1.3.3
-nexus3.onap.org:10001/onap/multicloud/k8s:0.4.0
-nexus3.onap.org:10001/onap/multicloud/openstack-fcaps:1.3.4
+nexus3.onap.org:10001/onap/multicloud/framework:1.4.2
+nexus3.onap.org:10001/onap/multicloud-framework-artifactbroker:1.4.2
+nexus3.onap.org:10001/onap/multicloud/openstack-fcaps:1.4.1
nexus3.onap.org:10001/onap/multicloud/openstack-lenovo:1.3.4
-nexus3.onap.org:10001/onap/multicloud/openstack-ocata:1.3.4
-nexus3.onap.org:10001/onap/multicloud/openstack-pike:1.3.4
-nexus3.onap.org:10001/onap/multicloud/openstack-starlingx:1.3.4
-nexus3.onap.org:10001/onap/multicloud/openstack-windriver:1.3.4
-nexus3.onap.org:10001/onap/multicloud/vio:1.3.1
+nexus3.onap.org:10001/onap/multicloud/openstack-pike:1.4.1
+nexus3.onap.org:10001/onap/multicloud/openstack-starlingx:1.4.1
+nexus3.onap.org:10001/onap/multicloud/openstack-windriver:1.4.1
+nexus3.onap.org:10001/onap/multicloud/vio:1.4.1
nexus3.onap.org:10001/onap/music/cassandra_3_11:3.0.24
nexus3.onap.org:10001/onap/music/cassandra_job:3.0.24
nexus3.onap.org:10001/onap/music/cassandra_music:3.0.0
nexus3.onap.org:10001/onap/music/music:3.0.24
nexus3.onap.org:10001/onap/network-discovery:1.5.1
nexus3.onap.org:10001/onap/oom/kube2msb:1.1.0
-nexus3.onap.org:10001/onap/optf-cmso-dbinit:2.0.0
-nexus3.onap.org:10001/onap/optf-cmso-optimizer:2.0.0
-nexus3.onap.org:10001/onap/optf-cmso-service:2.0.0
-nexus3.onap.org:10001/onap/optf-cmso-ticketmgt:2.0.0
-nexus3.onap.org:10001/onap/optf-cmso-topology:2.0.0
-nexus3.onap.org:10001/onap/optf-has:1.3.1
-nexus3.onap.org:10001/onap/optf-osdf:1.3.2
+nexus3.onap.org:10001/onap/optf-cmso-dbinit:2.1.1
+nexus3.onap.org:10001/onap/optf-cmso-optimizer:2.1.1
+nexus3.onap.org:10001/onap/optf-cmso-robot:2.1.1
+nexus3.onap.org:10001/onap/optf-cmso-service:2.1.1
+nexus3.onap.org:10001/onap/optf-cmso-ticketmgt:2.1.1
+nexus3.onap.org:10001/onap/optf-cmso-topology:2.1.1
+nexus3.onap.org:10001/onap/optf-has:1.3.3
+nexus3.onap.org:10001/onap/optf-osdf:1.3.4
nexus3.onap.org:10001/onap/org.onap.ccsdk.dashboard.ccsdk-app-os:1.1.0
-nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.1.0
+nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.3.0
nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.snmptrap:1.4.0
nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.4.5
-nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.cm-container:1.6.2
+nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.cm-container:2.0.2
nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.consul-loader-container:1.0.0
-nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.healthcheck-container:1.2.4
-nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.18
+nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.dcae-k8s-cleanup-container:1.0.0
+nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.healthcheck-container:1.2.5
+nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.6.4
nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.multisite-init-container:1.0.0
nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.redis-cluster-container:1.0.0
nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.2
nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tls-init-container:1.0.3
-nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.3.0
-nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.deployment-handler:4.0.1
-nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.inventory-api:3.2.0
+nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding:2.5.2
+nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.deployment-handler:4.2.0
+nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.inventory-api:3.4.0
nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.policy-handler:5.0.0
-nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.servicechange-handler:1.1.5
-nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.2.4
-nexus3.onap.org:10001/onap/policy-apex-pdp:2.1.0
-nexus3.onap.org:10001/onap/policy-api:2.0.1
-nexus3.onap.org:10001/onap/policy-distribution:2.1.0
-nexus3.onap.org:10001/onap/policy-pap:2.0.1
-nexus3.onap.org:10001/onap/policy-pdpd-cl:1.4.2
-nexus3.onap.org:10001/onap/policy-pe:1.4.1
-nexus3.onap.org:10001/onap/policy-xacml-pdp:2.0.1
-nexus3.onap.org:10001/onap/pomba-aai-context-builder:1.4.0
-nexus3.onap.org:10001/onap/pomba-context-aggregator:1.4.0
-nexus3.onap.org:10001/onap/pomba-network-discovery-context-builder:1.4.0
-nexus3.onap.org:10001/onap/pomba-sdc-context-builder:1.4.0
-nexus3.onap.org:10001/onap/pomba-sdnc-context-builder:1.4.0
-nexus3.onap.org:10001/onap/portal-app:2.5.0
-nexus3.onap.org:10001/onap/portal-db:2.5.0
-nexus3.onap.org:10001/onap/portal-sdk:2.5.0
-nexus3.onap.org:10001/onap/portal-wms:2.5.0
-nexus3.onap.org:10001/onap/sdc-backend:1.4.1
-nexus3.onap.org:10001/onap/sdc-backend-init:1.4.1
-nexus3.onap.org:10001/onap/sdc-cassandra-init:1.4.1
-nexus3.onap.org:10001/onap/sdc-elasticsearch:1.4.1
-nexus3.onap.org:10001/onap/sdc-frontend:1.4.1
-nexus3.onap.org:10001/onap/sdc-init-elasticsearch:1.4.1
-nexus3.onap.org:10001/onap/sdc-kibana:1.4.1
-nexus3.onap.org:10001/onap/sdc-onboard-backend:1.4.1
-nexus3.onap.org:10001/onap/sdc-onboard-cassandra-init:1.4.1
-nexus3.onap.org:10001/onap/sdnc-ansible-server-image:1.5.4
-nexus3.onap.org:10001/onap/sdnc-dmaap-listener-image:1.5.4
-nexus3.onap.org:10001/onap/sdnc-image:1.5.4
-nexus3.onap.org:10001/onap/sdnc-ueb-listener-image:1.5.4
+nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.servicechange-handler:1.3.2
+nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.3.1
+nexus3.onap.org:10001/onap/policy-apex-pdp:2.2.2
+nexus3.onap.org:10001/onap/policy-api:2.1.2
+nexus3.onap.org:10001/onap/policy-distribution:2.2.1
+nexus3.onap.org:10001/onap/policy-pap:2.1.2
+nexus3.onap.org:10001/onap/policy-pdpd-cl:1.5.3
+nexus3.onap.org:10001/onap/policy-pe:1.5.2
+nexus3.onap.org:10001/onap/policy-xacml-pdp:2.1.2
+nexus3.onap.org:10001/onap/pomba-aai-context-builder:1.5.1
+nexus3.onap.org:10001/onap/pomba-context-aggregator:1.5.1
+nexus3.onap.org:10001/onap/pomba-network-discovery-context-builder:1.5.1
+nexus3.onap.org:10001/onap/pomba-sdc-context-builder:1.5.1
+nexus3.onap.org:10001/onap/pomba-sdnc-context-builder:1.5.1
+nexus3.onap.org:10001/onap/portal-app:2.6.0
+nexus3.onap.org:10001/onap/portal-db:2.6.0
+nexus3.onap.org:10001/onap/portal-sdk:2.6.0
+nexus3.onap.org:10001/onap/portal-wms:2.6.0
+nexus3.onap.org:10001/onap/sdc-backend:1.5.2
+nexus3.onap.org:10001/onap/sdc-backend-init:1.5.2
+nexus3.onap.org:10001/onap/sdc-cassandra-init:1.5.2
+nexus3.onap.org:10001/onap/sdc-elasticsearch:1.5.2
+nexus3.onap.org:10001/onap/sdc-frontend:1.5.2
+nexus3.onap.org:10001/onap/sdc-init-elasticsearch:1.5.2
+nexus3.onap.org:10001/onap/sdc-kibana:1.5.2
+nexus3.onap.org:10001/onap/sdc-onboard-backend:1.5.2
+nexus3.onap.org:10001/onap/sdc-onboard-cassandra-init:1.5.2
+nexus3.onap.org:10001/onap/sdnc-ansible-server-image:1.7.4
+nexus3.onap.org:10001/onap/sdnc-dmaap-listener-image:1.7.4
+nexus3.onap.org:10001/onap/sdnc-image:1.7.4
+nexus3.onap.org:10001/onap/sdnc-ueb-listener-image:1.7.4
nexus3.onap.org:10001/onap/search-data-service:1.3.1
-nexus3.onap.org:10001/onap/search-data-service:1.4.3
+nexus3.onap.org:10001/onap/search-data-service:1.5.1
nexus3.onap.org:10001/onap/service-decomposition:1.5.1
nexus3.onap.org:10001/onap/sniroemulator:1.0.0
-nexus3.onap.org:10001/onap/so/api-handler-infra:1.4.3
-nexus3.onap.org:10001/onap/so/bpmn-infra:1.4.4
-nexus3.onap.org:10001/onap/so/catalog-db-adapter:1.4.4
-nexus3.onap.org:10001/onap/so/openstack-adapter:1.4.4
-nexus3.onap.org:10001/onap/so/request-db-adapter:1.4.4
-nexus3.onap.org:10001/onap/so/sdc-controller:1.4.4
-nexus3.onap.org:10001/onap/so/sdnc-adapter:1.4.4
-nexus3.onap.org:10001/onap/so/so-monitoring:1.4.4
-nexus3.onap.org:10001/onap/so/vfc-adapter:1.4.4
-nexus3.onap.org:10001/onap/so/vnfm-adapter:1.4.4
-nexus3.onap.org:10001/onap/sparky-be:1.4.0
-nexus3.onap.org:10001/onap/spike:1.4.0
-nexus3.onap.org:10001/onap/testsuite:1.4.2
-nexus3.onap.org:10001/onap/usecase-ui:1.2.2
-nexus3.onap.org:10001/onap/usecase-ui-server:1.2.1
+nexus3.onap.org:10001/onap/so/api-handler-infra:1.5.3
+nexus3.onap.org:10001/onap/so/bpmn-infra:1.5.3
+nexus3.onap.org:10001/onap/so/catalog-db-adapter:1.5.3
+nexus3.onap.org:10001/onap/so/openstack-adapter:1.5.3
+nexus3.onap.org:10001/onap/so/request-db-adapter:1.5.3
+nexus3.onap.org:10001/onap/so/sdc-controller:1.5.3
+nexus3.onap.org:10001/onap/so/sdnc-adapter:1.5.3
+nexus3.onap.org:10001/onap/so/so-monitoring:1.5.3
+nexus3.onap.org:10001/onap/so/vfc-adapter:1.5.3
+nexus3.onap.org:10001/onap/so/vnfm-adapter:1.5.3
+nexus3.onap.org:10001/onap/sparky-be:1.5.1
+nexus3.onap.org:10001/onap/testsuite:1.5.4
+nexus3.onap.org:10001/onap/usecase-ui:2.0.1
+nexus3.onap.org:10001/onap/usecase-ui-server:2.0.1
nexus3.onap.org:10001/onap/validation:1.3.1
-nexus3.onap.org:10001/onap/vfc/catalog:1.3.2
-nexus3.onap.org:10001/onap/vfc/db:1.3.0
+nexus3.onap.org:10001/onap/vfc/catalog:1.3.4
+nexus3.onap.org:10001/onap/vfc/db:1.3.1
nexus3.onap.org:10001/onap/vfc/emsdriver:1.3.0
-nexus3.onap.org:10001/onap/vfc/gvnfmdriver:1.3.3
+nexus3.onap.org:10001/onap/vfc/gvnfmdriver:1.3.5
nexus3.onap.org:10001/onap/vfc/jujudriver:1.3.1
nexus3.onap.org:10001/onap/vfc/multivimproxy:1.3.0
nexus3.onap.org:10001/onap/vfc/nfvo/svnfm/huawei:1.3.0
nexus3.onap.org:10001/onap/vfc/nfvo/svnfm/nokiav2:1.3.0
-nexus3.onap.org:10001/onap/vfc/nslcm:1.3.2
+nexus3.onap.org:10001/onap/vfc/nslcm:1.3.4
nexus3.onap.org:10001/onap/vfc/resmanagement:1.3.0
-nexus3.onap.org:10001/onap/vfc/vnflcm:1.3.2
-nexus3.onap.org:10001/onap/vfc/vnfmgr:1.3.3
-nexus3.onap.org:10001/onap/vfc/vnfres:1.3.2
+nexus3.onap.org:10001/onap/vfc/vnflcm:1.3.4
+nexus3.onap.org:10001/onap/vfc/vnfmgr:1.3.4
+nexus3.onap.org:10001/onap/vfc/vnfres:1.3.4
nexus3.onap.org:10001/onap/vfc/wfengine-activiti:1.3.0
nexus3.onap.org:10001/onap/vfc/wfengine-mgrservice:1.3.0
nexus3.onap.org:10001/onap/vfc/ztesdncdriver:1.3.0
nexus3.onap.org:10001/onap/vfc/ztevnfmdriver:1.3.1
-nexus3.onap.org:10001/onap/vid:4.3.1
+nexus3.onap.org:10001/onap/vid:5.0.3
nexus3.onap.org:10001/onap/vnfsdk/refrepo:1.3.2
-nexus3.onap.org:10001/onap/workflow-backend:1.4.1
-nexus3.onap.org:10001/onap/workflow-frontend:1.4.1
-nexus3.onap.org:10001/onap/workflow-init:1.4.1
-nexus3.onap.org:10001/sonatype/nexus:2.14.8-01
+nexus3.onap.org:10001/onap/workflow-backend:1.5.1
+nexus3.onap.org:10001/onap/workflow-frontend:1.5.1
+nexus3.onap.org:10001/onap/workflow-init:1.5.1
+nexus3.onap.org:10001/sonatype/nexus:2.14.13-01
nexus3.onap.org:10001/zookeeper:3.4
oomk8s/mariadb-client-init:3.0.0
oomk8s/readiness-check:2.0.0
@@ -222,4 +219,6 @@ rabbitmq:alpine
registry.hub.docker.com/library/busybox:latest
registry.hub.docker.com/library/consul:1.4.3
registry.hub.docker.com/library/mongo:4.0.8
+registry.hub.docker.com/onap/multicloud-framework-artifactbroker:1.4.2
+registry.hub.docker.com/onap/multicloud-k8s:0.5.0
registry.hub.docker.com/oomk8s/ubuntu-init:2.0.0
diff --git a/build/docker-entrypoint.sh b/build/docker-entrypoint.sh
index 1b4ec53c..14f6aaa7 100755
--- a/build/docker-entrypoint.sh
+++ b/build/docker-entrypoint.sh
@@ -14,7 +14,7 @@ help () {
echo -e "-l --list: set path where rpm list is stored in container\n"
echo "Both paths have to be set with shared volume between"
echo "container and host computer. Default path in container is: /tmp/"
- echo "Repository will be created at: /<path>/resources/pkg/rhel/"
+ echo "Repository will be created at: /<path>/resources/pkg/rpm/"
echo "RMP list is stored at: ./data_list/"
}
@@ -52,7 +52,7 @@ do
done
# Testing if directory parametter was used
-# If not variable is sets to default value /tmp/repo/resources/pkg/rhel
+# If not variable is sets to default value /tmp/repo/resources/pkg/rpm
if test -z "$OFFLINE_REPO_DIR"
then
OFFLINE_REPO_DIR="/tmp/repo/"
diff --git a/build/package.py b/build/package.py
index ad921ed3..47f78b87 100755
--- a/build/package.py
+++ b/build/package.py
@@ -33,7 +33,8 @@ import tarfile
import git
log = logging.getLogger(__name__)
-script_location = os.path.dirname(os.path.realpath(__file__))
+script_location = os.path.abspath(os.path.join(__file__, '..'))
+offline_repository_dir = os.path.abspath(os.path.join(script_location, '..'))
def prepare_application_repository(directory, url, refspec, patch_path):
@@ -73,6 +74,7 @@ def create_package_info_file(output_file, repository_list, tag):
Generates text file in json format containing basic information about the build
:param output_file:
:param repository_list: list of repositories to be included in package info
+ :param tag: build version of packages
:return:
"""
log.info('Generating package.info file')
@@ -100,7 +102,7 @@ def create_package(tar_content, file_name):
with tarfile.open(file_name, 'w') as output_tar_file:
for src, dst in tar_content.items():
if src != '':
- output_tar_file.add(src, dst)
+ output_tar_file.add(src, dst)
def build_offline_deliverables(build_version,
@@ -139,11 +141,10 @@ def build_offline_deliverables(build_version,
if os.path.exists(output_dir) and os.listdir(output_dir):
if not overwrite:
log.error('Output directory is not empty, use overwrite to force build')
- raise FileExistsError
+ raise FileExistsError(output_dir)
shutil.rmtree(output_dir)
# Git
- offline_repository_dir = os.path.join(script_location, '..')
offline_repository = git.Repo(offline_repository_dir)
application_dir = os.path.join(output_dir, 'application_repository')
@@ -173,6 +174,9 @@ def build_offline_deliverables(build_version,
info_file: 'package.info'
}
+ # add separator if build version not empty
+ build_version = "-" + build_version if build_version != "" else ""
+
if not skip_sw:
log.info('Building offline installer')
os.chdir(os.path.join(offline_repository_dir, 'ansible', 'docker'))
@@ -194,7 +198,7 @@ def build_offline_deliverables(build_version,
log.info('Binaries - workaround')
download_dir_path = os.path.join(resources_directory, 'downloads')
os.chdir(download_dir_path)
- for file in os.listdir():
+ for file in os.listdir(download_dir_path):
if os.path.islink(file):
os.unlink(file)
@@ -214,7 +218,7 @@ def build_offline_deliverables(build_version,
create_package(resources_content, resources_package_tar_path)
if not skip_aux:
- aux_package_tar_path = os.path.join(output_dir, 'aux_package'+ build_version + '.tar')
+ aux_package_tar_path = os.path.join(output_dir, 'aux_package' + build_version + '.tar')
create_package(aux_content, aux_package_tar_path)
shutil.rmtree(application_dir)
@@ -226,7 +230,7 @@ def run_cli():
"""
parser = argparse.ArgumentParser(description='Create Package For Offline Installer')
parser.add_argument('--build-version',
- help='version of the build', default='custom')
+ help='version of the build', default='')
parser.add_argument('application_repository_url', metavar='application-repository-url',
help='git repository hosting application helm charts')
parser.add_argument('--application-repository_reference', default='master',
@@ -234,16 +238,17 @@ def run_cli():
parser.add_argument('--application-patch_file',
help='git patch file to be applied over application repository', default='')
parser.add_argument('--application-charts_dir',
- help='path to directory under application repository containing helm charts ', default='kubernetes')
+ help='path to directory under application repository containing helm charts ',
+ default='kubernetes')
parser.add_argument('--application-configuration',
help='path to application configuration file (helm override configuration)',
- default='')
+ default=os.path.join(offline_repository_dir, 'config/application_configuration.yml'))
parser.add_argument('--application-patch-role',
help='path to application patch role file (ansible role) to be executed right before installation',
default='')
- parser.add_argument('--output-dir', '-o', default=os.path.join(script_location, '..', '..'),
+ parser.add_argument('--output-dir', '-o', default=os.path.join(offline_repository_dir, '../packages'),
help='Destination directory for saving packages')
- parser.add_argument('--resources-directory', default='',
+ parser.add_argument('--resources-directory', default=os.path.join(offline_repository_dir, '../resources'),
help='Path to resource directory')
parser.add_argument('--aux-directory',
help='Path to aux binary directory', default='')