Remove python:3.6, python-jessie:3 from the tests. (#207)

falkzoll · web-flow · commit f1f05a0e5542 · 2022-10-27T09:10:47.000+02:00
- The Python 3.6 based runtimes are deprecated due to Python 3.6 end of support.
diff --git a/ansible/environments/local/group_vars/all b/ansible/environments/local/group_vars/all
@@ -35,28 +35,13 @@ runtimes_manifest:
         name: "nodejs6action"
       deprecated: false
     python:
-    - kind: "python:2"
-      default: true
-      image:
-        name: "python2action"
-      deprecated: false
-    - kind: "python-jessie:3"
-      default: false
-      image:
-        name: "action-python-v3.6"
-      deprecated: false
-    - kind: "python:3.6"
-      default: false
-      image:
-        name: "action-python-v3.6"
-      deprecated: false
     - kind: "python:3.7"
       default: false
       image:
         name: "action-python-v3.7"
       deprecated: false
     - kind: "python:3.9"
-      default: false
+      default: true
       image:
         name: "action-python-v3.9"
       deprecated: false
diff --git a/tests/build.gradle b/tests/build.gradle
@@ -15,6 +15,11 @@ tasks.withType(Test) {
         exceptionFormat = 'full'
     }
     outputs.upToDateWhen { false } // force tests to run every time
+
+    // We only test the python:3.7 and python:3.9 runtimes.
+    // The default python:3.6 is deprecated (it reached end of support).
+    include '**/*IBMPython37*'
+    include '**/*IBMPython39*'
 }
 
 task testWithoutCredentials(type: Test) {
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
@@ -26,8 +26,6 @@ docker pull ibmfunctions/invoker:nightly
 docker tag ibmfunctions/invoker:nightly ${IMAGE_PREFIX}/invoker
 docker pull openwhisk/nodejs6action:nightly
 docker tag openwhisk/nodejs6action:nightly nodejs6action
-docker pull openwhisk/python2action
-docker tag openwhisk/python2action python2action
 
 TERM=dumb ./gradlew install
 
diff --git a/tools/travis/test.sh b/tools/travis/test.sh
@@ -13,10 +13,6 @@ export OPENWHISK_HOME=$WHISKDIR
 WHISK_CLI="${WHISKDIR}/bin/wsk -i"
 
 # Run a simple action using the kind
-${WHISK_CLI} action update echoPython ${ROOTDIR}/tests/dat/echo.py --kind "python-jessie:3"
-${WHISK_CLI} action invoke echoPython -b
-${WHISK_CLI} action update echoPython ${ROOTDIR}/tests/dat/echo.py --kind "python:3.6"
-${WHISK_CLI} action invoke echoPython -b
 ${WHISK_CLI} action update echoPython ${ROOTDIR}/tests/dat/echo.py --kind "python:3.7"
 ${WHISK_CLI} action invoke echoPython -b
 ${WHISK_CLI} action update echoPython ${ROOTDIR}/tests/dat/echo.py --kind "python:3.9"
@@ -32,7 +28,5 @@ else
 fi
 
 
-
-
 #For some reason there no activations, maybe index not ready
 #${WHISK_CLI} activation get --last

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,11 @@ tasks.withType(Test) {`
`15`	`15`	`exceptionFormat = 'full'`
`16`	`16`	`}`
`17`	`17`	`outputs.upToDateWhen { false } // force tests to run every time`
	`18`	`+`
	`19`	`+ // We only test the python:3.7 and python:3.9 runtimes.`
	`20`	`+ // The default python:3.6 is deprecated (it reached end of support).`
	`21`	`+ include '*/IBMPython37*'`
	`22`	`+ include '*/IBMPython39*'`
`18`	`23`	`}`
`19`	`24`
`20`	`25`	`task testWithoutCredentials(type: Test) {`