Synse Server v3 release

.dockerignore

@@ -1,11 +1,3 @@
-#
-# .dockerignore.default
-#
-# The dockerignore file used for default Synse Server image builds.
-# By default, Synse Server includes the emulator. For a version of
-# Synse Server without the emulator, use the 'slim' build.
-#
-
 # JetBrains (PyCharm, WebStorm, etc.)
 .idea
 *.iws
@@ -40,32 +32,28 @@ build
 dist
 
 # Test Artifacts
-results
+htmlcov
 .jenkins
 .coverage
 .pytest_cache
-tests/testdata
+tox.ini
 
 # Logs
 logs/
 *.log
 
 # Docker
-dockerfile
-Dockerfile.*
+Dockerfile
 
 # Docs
-docs
 **/*.md
 **/*.rst
 NOTICE
-proposals/
 
 # Scripts
 bin/ci
 
 # Other
 **/*.png
-assets
-compose
-deploy
+**/*.svg
+examples

.gitignore

@@ -8,7 +8,6 @@ __pycache__/
 
 # Distribution / packaging
 .Python
-env/
 build/
 develop-eggs/
 dist/
@@ -24,6 +23,7 @@ wheels/
 *.egg-info/
 .installed.cfg
 *.egg
+MANIFEST
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -35,10 +35,6 @@ wheels/
 pip-log.txt
 pip-delete-this-directory.txt
 
-# Translations
-*.mo
-*.pot
-
 # Unit test / coverage reports
 htmlcov/
 .tox/
@@ -47,42 +43,69 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
-*,cover
+*.cover
 .hypothesis/
-results/
-prof/
-*.log
 .pytest_cache/
-tests/testdata/*
-!tests/testdata/README.md
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
 
 # Flask stuff:
 instance/
 .webassets-cache
 
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# mkdocs documentation
+/site
+
 # PyBuilder
 target/
 
+# Jupyter Notebook
+.ipynb_checkpoints
+
 # pyenv
 .python-version
 
 # celery beat schedule file
 celerybeat-schedule
 
-# dotenv
-.env
+# SageMath parsed files
+*.sage.py
 
-# virtualenv
+# Environments
+.env
 .venv
+env/
 venv/
 ENV/
+env.bak/
+venv.bak/
 
-.vagrant
-.idea
-.DS_Store
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
 
-# packages
-*.rpm
-*.deb
+# mypy
+.mypy_cache/
 
+# IDEs / Editors
+.idea/
+
+# Other
+.DS_Store
 docs/build

.jenkins

@@ -12,122 +12,56 @@ pipeline {
         checkout scm
       }
     }
-    // Lint the project source code.
+
     stage('Lint') {
       steps {
-        sh 'make lint'
-      }
-      post {
-        success {
-          script {
-            if (env.CHANGE_ID) {
-              pullRequest.createStatus(
-                status: 'success',
-                context: 'vio-build/lint',
-                description: 'Source code linting succeeded',
-                targetUrl: "${env.RUN_DISPLAY_URL}"
-              )
-            }
-          }
-        }
-        failure {
-          script {
-            if (env.CHANGE_ID) {
-              pullRequest.createStatus(
-                status: 'failure',
-                context: 'vio-build/lint',
-                description: 'Source code linting failed',
-                targetUrl: "${env.RUN_DISPLAY_URL}"
-              )
-            }
-          }
-        }
+        sh 'tox -e lint'
       }
     }
-    // Run unit and integration tests, generate and upload coverage report.
+
     stage('Test') {
+      agent {
+        label 'python-3.8'
+      }
       environment {
         CODECOV_TOKEN = credentials('codecov-token')
       }
       steps {
-        sh 'make test-unit'
-        sh 'codecov'
-        sh 'make test-integration'
-      }
-      post {
-        success {
-          script {
-            if (env.CHANGE_ID) {
-              pullRequest.createStatus(
-                status: 'success',
-                context: 'vio-build/test',
-                description: 'Tests passed',
-                targetUrl: "${env.RUN_DISPLAY_URL}"
-              )
-            }
-          }
-        }
-        failure {
-          script {
-            if (env.CHANGE_ID) {
-              pullRequest.createStatus(
-                status: 'success',
-                context: 'vio-build/test',
-                description: 'Tests failed',
-                targetUrl: "${env.RUN_DISPLAY_URL}"
-              )
-            }
-          }
+        container('python') {
+          sh 'tox tests/unit'
         }
       }
     }
-    // Verify that the Docker image builds successfully.
-    stage('Build Image') {
+
+    stage('Verify Image Build') {
       steps {
-        sh 'make docker'
-      }
-      post {
-        success {
-          script {
-            if (env.CHANGE_ID) {
-              pullRequest.createStatus(
-                status: 'success',
-                context: 'vio-build/build-image',
-                description: 'Successfully built docker image',
-                targetUrl: "${env.RUN_DISPLAY_URL}"
-              )
-            }
-          }
-        }
-        failure {
-          script {
-            if (env.CHANGE_ID) {
-              pullRequest.createStatus(
-                status: 'success',
-                context: 'vio-build/build-image',
-                description: 'Failed to build docker image',
-                targetUrl: "${env.RUN_DISPLAY_URL}"
-              )
-            }
-          }
-        }
+        sh '''
+          docker build \
+            --label build_date=$(date -u +%Y-%m-%dT%T 2> /dev/null) \
+            --label version=$(python setup.py --version) \
+            --label commit=$(git rev-parse --short HEAD 2> /dev/null || true) \
+             -t ${IMAGE_NAME}:canary .
+        '''
       }
     }
-    // Build the image with the 'edge' tag and publish it to DockerHub. This
-    // should only be run on the master branch (e.g. PR merge)
-    stage('Publish Edge Image') {
+
+    stage('Publish "latest" Image (master)') {
       when {
         branch 'master'
       }
       steps {
         withDockerRegistry(registry: [credentialsId: 'vio-docker-hub']) {
-          sh './bin/ci/build_and_publish.sh edge'
+          sh '''
+            docker build \
+              --label build_date=$(date -u +%Y-%m-%dT%T 2> /dev/null) \
+              --label version=$(python setup.py --version) \
+              --label commit=$(git rev-parse --short HEAD 2> /dev/null || true) \
+              -t ${IMAGE_NAME}:latest .
+          '''
         }
       }
     }
-    // Generate a new release draft on GitHub for a tag matching a version string
-    // pattern. The release will include an auto-generated changelog and build
-    // artifacts.
+
     stage('Draft GitHub Release') {
       when {
         buildingTag()
@@ -138,8 +72,8 @@ pipeline {
         GITHUB_REPONAME = 'synse-server'
       }
       steps {
-        sh 'make ci-check-version'
-        sh 'make ci-package'
+        // Build package distribution
+        sh 'python setup.py sdist --formats=gztar,zip'
 
         // Auto-generate a changelog for the release
         sh './bin/ci/generate_changelog.sh'
@@ -149,19 +83,17 @@ pipeline {
         sh 'docker run --rm -v $PWD:/repo edaniszewski/ghr -u ${GITHUB_USER} -r ${GITHUB_REPONAME} -t ${GITHUB_TOKEN} -b "$(cat ./CHANGELOG.md)" -replace -draft ${TAG_NAME} dist'
       }
     }
-    // Build the image with the release tags and publish it to Dockerhub. This
-    // should only be run on a git tag matching a version string pattern. This
-    // should only run if the "Draft GitHub Release" stage completed successfully.
+
     stage('Publish Release Images') {
       when {
         buildingTag()
       }
       steps {
-        sh 'make ci-check-version'
         withDockerRegistry(registry: [credentialsId: 'vio-docker-hub']) {
           sh './bin/ci/build_and_publish.sh latest'
         }
       }
     }
+
   }
 }