diff options
14 files changed, 178 insertions, 4 deletions
@@ -38,5 +38,5 @@ A platform to automate and manage different kind of VNF test cases for given VNF Docker image building ===================== ``` - mvn clean package -Pdocker + mvn clean package -Pdocker -Dpush.docker.image=false ``` diff --git a/releases/1.5.2-container.yaml b/releases/1.5.2-container.yaml new file mode 100644 index 00000000..578c47b8 --- /dev/null +++ b/releases/1.5.2-container.yaml @@ -0,0 +1,9 @@ +--- +distribution_type: container +container_release_tag: '1.5.2' +project: 'vnfsdk-refrepo' +log_dir: 'vnfsdk-refrepo-maven-docker-stage-master/354' +ref: 5ff7ee49fdc6ae66b1ff2bbe581079a49a114ae0 +containers: + - name: vnfsdk/refrepo + version: 1.5.1-20200521T114704Z diff --git a/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/Dockerfile b/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/Dockerfile index 704d08c3..57f7493e 100644 --- a/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/Dockerfile +++ b/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/Dockerfile @@ -1,3 +1,16 @@ +# Copyright 2020 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # This file was auto-generated by gen-all-dockerfiles.sh; do not modify manually. # diff --git a/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/marketplace_tables_postgres.sql b/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/marketplace_tables_postgres.sql index f654efd3..cef3349d 100644 --- a/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/marketplace_tables_postgres.sql +++ b/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/marketplace_tables_postgres.sql @@ -1,3 +1,19 @@ +/* + * Copyright 2020 Huawei Technologies Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + CREATE DATABASE "marketplaceDB"; \c marketplaceDB; diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml index c181243c..23274d4d 100644 --- a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml +++ b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml @@ -35,6 +35,7 @@ <properties> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <docker.push.registry>nexus3.onap.org:10003</docker.push.registry> + <push.docker.image>true</push.docker.image> <docker.skip>false</docker.skip> <docker.noCache>true</docker.noCache> <docker.skip.build>false</docker.skip.build> @@ -88,7 +89,7 @@ <configuration> <image>onap/vnfsdk/refrepo</image> <newName>${docker.push.registry}/onap/vnfsdk/refrepo:${project.version}-${maven.build.timestamp}</newName> - <pushImage>true</pushImage> + <pushImage>${push.docker.image}</pushImage> <skipDockerTag>false</skipDockerTag> </configuration> </execution> @@ -101,7 +102,7 @@ <configuration> <image>onap/vnfsdk/refrepo</image> <newName>${docker.push.registry}/onap/vnfsdk/refrepo:latest</newName> - <pushImage>true</pushImage> + <pushImage>${push.docker.image}</pushImage> <skipDockerTag>false</skipDockerTag> </configuration> </execution> diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile index 85e6205e..65812d67 100644 --- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile +++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile @@ -1,3 +1,16 @@ +# Copyright 2020 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # This file was auto-generated by gen-all-dockerfiles.sh; do not modify manually. # diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/certgen.sh b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/certgen.sh index 489e4ee2..ae3d3515 100755 --- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/certgen.sh +++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/certgen.sh @@ -1,4 +1,20 @@ #!/bin/sh +# +# Copyright 2020 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + openssl req -nodes -newkey rsa:2048 -keyout example.key -out example.csr -subj "/C=IN/ST=Bangalore/L=Bangalore/O=Global Security/OU=ONAP/CN=example.com" openssl x509 -req -in example.csr -signkey example.key -out cert.crt cp -p cert.crt /etc/nginx/ssl/ diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/nginx.conf b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/nginx.conf index ef50c595..f6932812 100644 --- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/nginx.conf +++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/nginx.conf @@ -1,3 +1,17 @@ +# Copyright 2020 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + daemon off; #pid /run/nginx.pid; diff --git a/vnfmarket-be/deployment/install/docker-compose.yml b/vnfmarket-be/deployment/install/docker-compose.yml index 961b2e38..923aa2a5 100644 --- a/vnfmarket-be/deployment/install/docker-compose.yml +++ b/vnfmarket-be/deployment/install/docker-compose.yml @@ -1,3 +1,17 @@ +# Copyright 2020 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + version: '2' networks: default: diff --git a/vnfmarket-be/deployment/install/vnfsdk_install.sh b/vnfmarket-be/deployment/install/vnfsdk_install.sh index e43f200a..09b2947f 100644 --- a/vnfmarket-be/deployment/install/vnfsdk_install.sh +++ b/vnfmarket-be/deployment/install/vnfsdk_install.sh @@ -1,5 +1,19 @@ #!/bin/bash - +# +# Copyright 2020 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) diff --git a/vnfmarket-be/deployment/install/vnfsdk_serv.sh b/vnfmarket-be/deployment/install/vnfsdk_serv.sh index f91a4d43..0a2c1377 100644 --- a/vnfmarket-be/deployment/install/vnfsdk_serv.sh +++ b/vnfmarket-be/deployment/install/vnfsdk_serv.sh @@ -1,4 +1,20 @@ #!/bin/sh +# +# Copyright 2020 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ### BEGIN INIT INFO # Provides: # Required-Start: $remote_fs $syslog diff --git a/vnfmarket-be/deployment/install/vnfsdk_vm_init.sh b/vnfmarket-be/deployment/install/vnfsdk_vm_init.sh index a3bcba8a..68182699 100755 --- a/vnfmarket-be/deployment/install/vnfsdk_vm_init.sh +++ b/vnfmarket-be/deployment/install/vnfsdk_vm_init.sh @@ -1,4 +1,20 @@ #!/bin/bash +# +# Copyright 2020 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + # Starts docker containers for VNFSDK VNF repository. # Version for Amsterdam/R1 uses docker-compose. diff --git a/vnfmarket-be/deployment/zip/src/main/release/init/marketplace_tables_mysql.sql b/vnfmarket-be/deployment/zip/src/main/release/init/marketplace_tables_mysql.sql index 7b84b18c..9df95b84 100644 --- a/vnfmarket-be/deployment/zip/src/main/release/init/marketplace_tables_mysql.sql +++ b/vnfmarket-be/deployment/zip/src/main/release/init/marketplace_tables_mysql.sql @@ -1,3 +1,19 @@ +/* + * Copyright 2020 Huawei Technologies Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + CREATE DATABASE marketplaceDB; USE marketplaceDB; diff --git a/vnfmarket-be/deployment/zip/src/main/release/init/marketplace_tables_postgres.sql b/vnfmarket-be/deployment/zip/src/main/release/init/marketplace_tables_postgres.sql index f654efd3..cef3349d 100644 --- a/vnfmarket-be/deployment/zip/src/main/release/init/marketplace_tables_postgres.sql +++ b/vnfmarket-be/deployment/zip/src/main/release/init/marketplace_tables_postgres.sql @@ -1,3 +1,19 @@ +/* + * Copyright 2020 Huawei Technologies Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + CREATE DATABASE "marketplaceDB"; \c marketplaceDB; |