From 7786b874b65eb29aba1a90d0eb856b76190fd08c Mon Sep 17 00:00:00 2001
From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 10 Nov 2022 12:32:02 +0100
Subject: [PATCH] Fix Dockerfile and Jenkinsfile to follow other repos, added
 copyright

Change-Id: I2db24b476eacf8d8fe7734f65befb44094d39239
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---
 CONTRIBUTING.md                |  2 ++
 Dockerfile                     | 35 +++++++++++++++++++++++++++++++---
 Jenkinsfile                    | 32 ++++++++++++++++---------------
 README.md                      |  2 ++
 devops-stages/stage-archive.sh |  4 +++-
 devops-stages/stage-build.sh   |  4 +++-
 devops-stages/stage-test.sh    |  3 +++
 7 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 37c7930..12ba582 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,6 @@
 <!--
+Copyright ETSI Contributors and Others.
+
 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
diff --git a/Dockerfile b/Dockerfile
index ac08971..f2d0e6e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,5 @@
+# Copyright ETSI Contributors and Others.
+#
 # 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
@@ -10,8 +12,35 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+########################################################################################
+# This Dockerfile is intented for devops testing and deb package generation
+#
+# To run stage 2 locally:
+#
+#   docker build -t stage2 .
+#   docker run -ti -v `pwd`:/work -w /work --entrypoint /bin/bash stage2
+#   devops-stages/stage-test.sh
+#   devops-stages/stage-build.sh
+#
+
+FROM ubuntu:20.04
+
+ARG APT_PROXY
+RUN if [ ! -z $APT_PROXY ] ; then \
+    echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\
+    echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\
+    fi
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install \
+        debhelper \
+        dh-python \
+        git \
+        python3 \
+        python3-all \
+        python3-dev \
+        python3-setuptools
 
-FROM ubuntu:18.04
+RUN python3 -m easy_install pip==21.3.1
+RUN pip install tox==3.24.5
 
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install git \
-    make python3 debhelper python3-setuptools apt-utils
diff --git a/Jenkinsfile b/Jenkinsfile
index 9f67d36..fcbfeb2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,17 +1,19 @@
-/*
-  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.
-*/
+/* Copyright ETSI OSM and others
+ *
+ * All Rights Reserved.
+ *
+ *   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.
+ */
 properties([
     parameters([
         string(defaultValue: env.BRANCH_NAME, description: '', name: 'GERRIT_BRANCH'),
@@ -30,7 +32,7 @@ def devops_checkout() {
     }
 }
 
-node('docker') {
+node('stage_2') {
     checkout scm
     devops_checkout()
 
diff --git a/README.md b/README.md
index 885dfb3..69a7402 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
 <!--
+Copyright ETSI Contributors and Others.
+
 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
diff --git a/devops-stages/stage-archive.sh b/devops-stages/stage-archive.sh
index 013953f..d059670 100644
--- a/devops-stages/stage-archive.sh
+++ b/devops-stages/stage-archive.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
-
+#
+# Copyright ETSI Contributors and Others.
+#
 # 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
diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh
index b58d1f3..94949c4 100644
--- a/devops-stages/stage-build.sh
+++ b/devops-stages/stage-build.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
-
+#
+# Copyright ETSI Contributors and Others.
+#
 # 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
diff --git a/devops-stages/stage-test.sh b/devops-stages/stage-test.sh
index 337cf59..24156af 100644
--- a/devops-stages/stage-test.sh
+++ b/devops-stages/stage-test.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# Copyright ETSI Contributors and Others.
+#
 # 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
-- 
2.25.1