Merge pull request #53153 from s0undt3ch/2019.2.1

[2019.2.1] Add Amazon Linux 2018.3 and 2 static requirements

.ci/kitchen-centos6-py2

@@ -88,8 +88,7 @@ timeout(time: 8, unit: 'HOURS') {
                             junit 'artifacts/xml-unittests-output/*.xml'
                         } finally {
                             cleanWs notFailBuild: true
-                            def currentResult = currentBuild.result ?: 'SUCCESS'
-                            if (currentResult == 'SUCCESS') {
+                            if (currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
                                 githubNotify credentialsId: 'test-jenkins-credentials',
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
                                     status: 'SUCCESS',

.ci/kitchen-centos7-py2

@@ -88,8 +88,7 @@ timeout(time: 8, unit: 'HOURS') {
                             junit 'artifacts/xml-unittests-output/*.xml'
                         } finally {
                             cleanWs notFailBuild: true
-                            def currentResult = currentBuild.result ?: 'SUCCESS'
-                            if (currentResult == 'SUCCESS') {
+                            if (currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
                                 githubNotify credentialsId: 'test-jenkins-credentials',
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
                                     status: 'SUCCESS',

.ci/kitchen-centos7-py3

@@ -88,8 +88,7 @@ timeout(time: 6, unit: 'HOURS') {
                             junit 'artifacts/xml-unittests-output/*.xml'
                         } finally {
                             cleanWs notFailBuild: true
-                            def currentResult = currentBuild.result ?: 'SUCCESS'
-                            if (currentResult == 'SUCCESS') {
+                            if (currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
                                 githubNotify credentialsId: 'test-jenkins-credentials',
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
                                     status: 'SUCCESS',

.ci/kitchen-debian8-py2

@@ -88,8 +88,7 @@ timeout(time: 8, unit: 'HOURS') {
                             junit 'artifacts/xml-unittests-output/*.xml'
                         } finally {
                             cleanWs notFailBuild: true
-                            def currentResult = currentBuild.result ?: 'SUCCESS'
-                            if (currentResult == 'SUCCESS') {
+                            if (currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
                                 githubNotify credentialsId: 'test-jenkins-credentials',
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
                                     status: 'SUCCESS',

.ci/kitchen-debian8-py3

@@ -88,8 +88,7 @@ timeout(time: 6, unit: 'HOURS') {
                             junit 'artifacts/xml-unittests-output/*.xml'
                         } finally {
                             cleanWs notFailBuild: true
-                            def currentResult = currentBuild.result ?: 'SUCCESS'
-                            if (currentResult == 'SUCCESS') {
+                            if (currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
                                 githubNotify credentialsId: 'test-jenkins-credentials',
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
                                     status: 'SUCCESS',

.ci/kitchen-debian9-py2

@@ -88,8 +88,7 @@ timeout(time: 6, unit: 'HOURS') {
                             junit 'artifacts/xml-unittests-output/*.xml'
                         } finally {
                             cleanWs notFailBuild: true
-                            def currentResult = currentBuild.result ?: 'SUCCESS'
-                            if (currentResult == 'SUCCESS') {
+                            if (currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
                                 githubNotify credentialsId: 'test-jenkins-credentials',
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
                                     status: 'SUCCESS',

.ci/kitchen-debian9-py3

@@ -88,8 +88,7 @@ timeout(time: 6, unit: 'HOURS') {
                             junit 'artifacts/xml-unittests-output/*.xml'
                         } finally {
                             cleanWs notFailBuild: true
-                            def currentResult = currentBuild.result ?: 'SUCCESS'
-                            if (currentResult == 'SUCCESS') {
+                            if (currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
                                 githubNotify credentialsId: 'test-jenkins-credentials',
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
                                     status: 'SUCCESS',

.ci/kitchen-ubuntu1604-py2

@@ -88,8 +88,7 @@ timeout(time: 6, unit: 'HOURS') {
                             junit 'artifacts/xml-unittests-output/*.xml'
                         } finally {
                             cleanWs notFailBuild: true
-                            def currentResult = currentBuild.result ?: 'SUCCESS'
-                            if (currentResult == 'SUCCESS') {
+                            if (currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
                                 githubNotify credentialsId: 'test-jenkins-credentials',
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
                                     status: 'SUCCESS',

.ci/kitchen-ubuntu1604-py3

@@ -88,8 +88,7 @@ timeout(time: 6, unit: 'HOURS') {
                             junit 'artifacts/xml-unittests-output/*.xml'
                         } finally {
                             cleanWs notFailBuild: true
-                            def currentResult = currentBuild.result ?: 'SUCCESS'
-                            if (currentResult == 'SUCCESS') {
+                            if (currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
                                 githubNotify credentialsId: 'test-jenkins-credentials',
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
                                     status: 'SUCCESS',

.ci/kitchen-ubuntu1804-py2

@@ -88,8 +88,7 @@ timeout(time: 6, unit: 'HOURS') {
                             junit 'artifacts/xml-unittests-output/*.xml'
                         } finally {
                             cleanWs notFailBuild: true
-                            def currentResult = currentBuild.result ?: 'SUCCESS'
-                            if (currentResult == 'SUCCESS') {
+                            if (currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
                                 githubNotify credentialsId: 'test-jenkins-credentials',
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
                                     status: 'SUCCESS',

.ci/kitchen-ubuntu1804-py3

@@ -88,8 +88,7 @@ timeout(time: 6, unit: 'HOURS') {
                             junit 'artifacts/xml-unittests-output/*.xml'
                         } finally {
                             cleanWs notFailBuild: true
-                            def currentResult = currentBuild.result ?: 'SUCCESS'
-                            if (currentResult == 'SUCCESS') {
+                            if (currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
                                 githubNotify credentialsId: 'test-jenkins-credentials',
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
                                     status: 'SUCCESS',

.ci/kitchen-windows2016-py2

@@ -87,8 +87,7 @@ timeout(time: 6, unit: 'HOURS') {
                             junit 'artifacts/xml-unittests-output/*.xml'
                         } finally {
                             cleanWs notFailBuild: true
-                            def currentResult = currentBuild.result ?: 'SUCCESS'
-                            if (currentResult == 'SUCCESS') {
+                            if (currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
                                 githubNotify credentialsId: 'test-jenkins-credentials',
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
                                     status: 'SUCCESS',

.ci/kitchen-windows2016-py3

@@ -87,8 +87,7 @@ timeout(time: 8, unit: 'HOURS') {
                             junit 'artifacts/xml-unittests-output/*.xml'
                         } finally {
                             cleanWs notFailBuild: true
-                            def currentResult = currentBuild.result ?: 'SUCCESS'
-                            if (currentResult == 'SUCCESS') {
+                            if (currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
                                 githubNotify credentialsId: 'test-jenkins-credentials',
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
                                     status: 'SUCCESS',

.pre-commit-config.yaml

@@ -149,7 +149,7 @@ repos:
         alias: compile-linux-py3.4-tcp-requirements
         name: Linux Py3.4 TCP Requirements
         files: ^requirements/((base|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.4
@@ -161,7 +161,7 @@ repos:
         alias: compile-linux-py3.4-zmq-requirements
         name: Linux Py3.4 ZeroMQ Requirements
         files: ^requirements/((base|zeromq|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.4
@@ -175,7 +175,7 @@ repos:
         alias: compile-linux-py3.4-raet-requirements
         name: Linux Py3.4 RAET Requirements
         files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.4
@@ -199,7 +199,7 @@ repos:
         alias: compile-linux-py3.5-tcp-requirements
         name: Linux Py3.5 TCP Requirements
         files: ^requirements/((base|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.5
@@ -233,7 +233,7 @@ repos:
         alias: compile-linux-py3.5-zmq-requirements
         name: Linux Py3.5 ZeroMQ Requirements
         files: ^requirements/((base|zeromq|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.5
@@ -273,7 +273,7 @@ repos:
         alias: compile-linux-py3.5-raet-requirements
         name: Linux Py3.5 RAET Requirements
         files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.5
@@ -325,7 +325,7 @@ repos:
         alias: compile-linux-py3.6-tcp-requirements
         name: Linux Py3.6 TCP Requirements
         files: ^requirements/((base|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.6
@@ -348,7 +348,7 @@ repos:
         alias: compile-linux-py3.6-zmq-requirements
         name: Linux Py3.6 ZeroMQ Requirements
         files: ^requirements/((base|zeromq|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.6
@@ -388,7 +388,7 @@ repos:
         alias: compile-linux-py3.6-raet-requirements
         name: Linux Py3.6 RAET Requirements
         files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.6
@@ -440,7 +440,7 @@ repos:
         alias: compile-linux-py3.7-tcp-requirements
         name: Linux Py3.7 TCP Requirements
         files: ^requirements/((base|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.7
@@ -463,7 +463,7 @@ repos:
         alias: compile-linux-py3.7-zmq-requirements
         name: Linux Py3.7 ZeroMQ Requirements
         files: ^requirements/((base|zeromq|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.7
@@ -503,7 +503,7 @@ repos:
         alias: compile-linux-py3.7-raet-requirements
         name: Linux Py3.7 RAET Requirements
         files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.7

requirements/static/amzn-2.in

@@ -0,0 +1,40 @@
+# This is a compilation of requirements installed on salt-jenkins git.salt state run
+apache-libcloud==2.0.0
+boto3
+boto>=2.46.0
+cffi
+cherrypy==17.3.0
+croniter>=0.3.0,!=0.3.22
+dnspython
+docker
+futures>=2.0; python_version < '3.0'
+GitPython
+jsonschema<=2.6.0
+junos-eznc
+jxmlease
+kazoo
+keyring==5.7.1
+kubernetes<4.0
+mock>=2.0.0; python_version < '3.6'
+more-itertools==5.0.0
+moto
+msgpack-python >= 0.4.2, != 0.5.5
+paramiko==2.1.2
+psutil
+# Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
+# PyCrypto, if pulled, will be removed from the generated static requirements
+pycryptodome
+pyinotify
+pyopenssl
+python-etcd>0.4.2
+python-gnupg
+pyvmomi
+requests
+rfc3987
+salttesting==2017.6.1
+setproctitle
+strict_rfc3339
+supervisor==3.3.5; python_version < '3'
+timelib
+tornado<5.0
+virtualenv

requirements/static/amzn-2018.03.in

@@ -0,0 +1,38 @@
+# This is a compilation of requirements installed on salt-jenkins git.salt state run
+apache-libcloud==2.0.0
+boto3
+boto>=2.46.0
+cffi
+cherrypy==17.3.0
+croniter>=0.3.0,!=0.3.22
+dnspython
+docker
+futures>=2.0; python_version < '3.0'
+GitPython<2.0.9
+jsonschema<=2.6.0
+junos-eznc
+jxmlease
+keyring==5.7.1
+kubernetes<4.0
+mock>=2.0.0; python_version < '3.6'
+more-itertools==5.0.0
+moto
+msgpack-python >= 0.4.2, != 0.5.5
+psutil
+# Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
+# PyCrypto, if pulled, will be removed from the generated static requirements
+pycryptodome
+pyinotify
+pyopenssl
+python-etcd>0.4.2
+python-gnupg
+pyvmomi
+requests
+rfc3987
+salttesting==2017.6.1
+setproctitle
+strict_rfc3339
+supervisor==3.3.5; python_version < '3'
+timelib
+tornado<5.0
+virtualenv