[CI] Always test against elastic-apm @ master (#68)

* Revert "[CI]: trigger build after apm-agent-python@master build finished and test it with the master branch (#64)"

This reverts commit 9f35b52.

* Always install elastic-apm from master for development/testing

.ci/Jenkinsfile

@@ -23,8 +23,6 @@ pipeline {
     issueCommentTrigger("${obltGitHubComments()}")
     // Only master branch will run on a timer basis
     cron(env.BRANCH_NAME == 'master' ? '@daily' : '')
-    // enable upstream trigger for the master branch only
-    upstream("/apm-agent-python/apm-agent-python-mbp/${ env.JOB_BASE_NAME.equals('master') ? 'master' : 'none' }")
   }
   stages {
     stage('Checkout') {
@@ -34,7 +32,6 @@ pipeline {
         deleteDir()
         gitCheckout(basedir: "${BASE_DIR}", githubNotifyFirstTimeContributor: true)
         stash allowEmpty: true, name: 'source', useDefaultExcludes: false
-        setEnvVar('ELASTIC_AGENT_PYTHON_BRANCH', isUpstreamTrigger(filter: 'apm-agent-python-mbp/master') ? 'master' : 'default')
       }
     }
     stage('Lint') {

noxfile.py

@@ -16,20 +16,13 @@
 # under the License.
 
 import nox
-import os
 
 
 SOURCE_FILES = ("noxfile.py", "tests/", "ecs_logging/")
 
 
 def tests_impl(session):
     session.install(".[develop]")
-    session.install(
-        ".[{0}]".format(
-            os.environ.get("ELASTIC_AGENT_PYTHON_BRANCH", "default").lower()
-        )
-    )
-
     session.run(
         "pytest",
         "--junitxml=junit-test.xml",

pyproject.toml

@@ -35,14 +35,7 @@ develop = [
     "pytest-cov",
     "mock",
     "structlog",
-]
-
-default = [
-    "elastic-apm",
-]
-
-master = [
-    'elastic-apm @ https://github.com/elastic/apm-agent-python/archive/master.zip',
+    "elastic-apm @ https://github.com/elastic/apm-agent-python/archive/master.zip",
 ]
 
 [tool.flit.metadata.urls]