Upgrade 2019, remove Probe Dock publishing

openaffect · Dec 2, 2019 · 9d7d3d0 · 9d7d3d0
1 parent f2d9a0c
commit 9d7d3d0
Show file tree

Hide file tree

Showing 10 changed files with 243 additions and 132 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -23,12 +23,11 @@ pipeline {
                    sh './build-docker-image.sh'
                    sh './run-docker-image.sh'
                }
-               echo 'Test results are available on Probe Dock: https://trial.probedock.io/avaliasystems/openaffectserver'
            }
        }   
        stage('Validation') {
            steps {
-               echo 'Test results are available on Probe Dock: https://trial.probedock.io/avaliasystems/openaffectserver'
+               echo 'API Tests have been executed.'
            }
        }   
     }

diff --git a/docker-images/jenkins/Dockerfile b/docker-images/jenkins/Dockerfile
@@ -1,6 +1,4 @@
-FROM jenkins/jenkins:2.107.2-alpine
-#FROM jenkins/jenkins:2.93-alpine
-
+FROM jenkins/jenkins:2.198-alpine
 
 #
 # Running jenkins as root (instead as jenkins) is not recommended for a regular CD server. However,
@@ -17,17 +15,32 @@ USER root
 # Install docker and docker-compose. Note that on alpine, we may be behind latest releases... See bottom of
 # this file to build an image with the latest version on a another linux distribution.
 #
-RUN apk update && apk add docker make py-pip shadow maven && pip install docker-compose
-RUN usermod -aG users jenkins
+RUN apk add --update \
+	docker \
+	py-pip \
+  python-dev \
+  gcc \
+  libc-dev \
+  make \
+	procps \
+	maven \
+	nodejs \
+	npm \
+  openjdk7 \
+  py-cffi \
+  libffi-dev \
+  openssl-dev \
+  libgcc && \
+  pip install --upgrade pip && \
+  pip install docker-compose	
+
+
+RUN /usr/local/bin/install-plugins.sh git matrix-auth workflow-aggregator docker-workflow credentials-binding blueocean
 
 #
 # Add initial jenkins configuration. This is how jenkins knows about our job. If we were accessing a private
 # git repo, we would also setup credentials and keys via this process.
 #
 ADD config/jenkins_home /var/jenkins_home/
 
-#
-# Install plugins that we want to use
-#
-RUN /usr/local/bin/install-plugins.sh nodejs workflow-aggregator pipeline-stage-view blueocean
 
diff --git a/docker-images/oa-java-server/tmp/java-server-0.0.1.jar b/docker-images/oa-java-server/tmp/java-server-0.0.1.jar
diff --git a/docker-images/oa-server-specs/run-tests-and-publish-to-probedock.sh b/docker-images/oa-server-specs/run-tests-and-publish-to-probedock.sh
@@ -5,10 +5,10 @@ mvn clean test -Dio.openaffect.server.url=http://openaffect:8080/api -Djava.secu
 
 
 # The API token will expire a year after creation (April 6th, 2017). Renew via Probe Dock UI
-cat target/surefire-reports/TEST-io.openaffect.api.spec.SpecificationTest.xml | curl --data-binary @- \
-                      -H "Content-Type: application/xml" \
-                      -H "Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJpc3MiOiIxeHFsbCIsIm5iZiI6MTQ5MTQ3MzYyNn0.iqdDSkeyRTu3UH6FjkgyzUNGjQooLqX4atWgz63V6jcXu5TsfkQa4UaJn_fk_bYcB4Q-gNzXsMQ5gWuU4Xpthg" \
-                      -H "Probe-Dock-Project-Id: p8wv23r9huat" \
-                      -H "Probe-Dock-Project-Version: 1.0.0" \
-                      -H "Probe-Dock-Category: BDD" \
-                      https://trial.probedock.io/api/publish
+#cat target/surefire-reports/TEST-io.openaffect.api.spec.SpecificationTest.xml | curl --data-binary @- \
+#                      -H "Content-Type: application/xml" \
+#                      -H "Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJpc3MiOiIxeHFsbCIsIm5iZiI6MTQ5MTQ3MzYyNn0.iqdDSkeyRTu3UH6FjkgyzUNGjQooLqX4atWgz63V6jcXu5TsfkQa4UaJn_fk_bYcB4Q-gNzXsMQ5gWuU4Xpthg" \
+#                      -H "Probe-Dock-Project-Id: p8wv23r9huat" \
+#                      -H "Probe-Dock-Project-Version: 1.0.0" \
+#                      -H "Probe-Dock-Category: BDD" \
+#                      https://trial.probedock.io/api/publish
diff --git a/microservices/oa-server-specs/ExecutableSpecification.iml b/microservices/oa-server-specs/ExecutableSpecification.iml
@@ -1,24 +1,116 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/swagger" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/target/cucumber" />
-      <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
-      <excludeFolder url="file://$MODULE_DIR$/target/maven-status" />
-      <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
-      <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
-      <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/swagger/src/test/java" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/swagger" isTestSource="false" generated="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.openapitools:openapi-generator-maven-plugin:4.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-build-api:0.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-utils:1.5.8" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-settings-builder:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-builder-support:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-repository-metadata:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-artifact:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-model-builder:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-aether-provider:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.aether:aether-spi:1.0.2.v20150114" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.aether:aether-impl:1.0.2.v20150114" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.aether:aether-api:1.0.2.v20150114" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.aether:aether-util:1.0.2.v20150114" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.enterprise:cdi-api:1.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.sisu:org.eclipse.sisu.inject:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.sisu:sisu-guice:no_aop:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-interpolation:1.21" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-classworlds:2.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-component-annotations:1.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-sec-dispatcher:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-compat:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-resolver-provider:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.resolver:maven-resolver-spi:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.resolver:maven-resolver-api:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.resolver:maven-resolver-util:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.resolver:maven-resolver-impl:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.wagon:wagon-provider-api:2.12" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.openapitools:openapi-generator:4.2.1" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core:2.0.10" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.0.10" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.0.10" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.parser.v3:swagger-parser:2.0.15" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.parser.v3:swagger-parser-v2-converter:2.0.15" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-parser:1.0.47" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-core:1.5.24" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.24" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.24" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-compat-spec-parser:1.0.47" level="project" />
+    <orderEntry type="library" name="Maven: com.github.java-json-tools:json-schema-validator:2.2.8" level="project" />
+    <orderEntry type="library" name="Maven: com.github.java-json-tools:json-schema-core:1.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.mozilla:rhino:1.7R4" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fge:uri-template:0.9" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mailapi:1.4.3" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.googlecode.libphonenumber:libphonenumber:8.0.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.jopt-simple:jopt-simple:5.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fge:json-patch:1.6" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fge:jackson-coreutils:1.6" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fge:msg-simple:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fge:btf:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.parser.v3:swagger-parser-core:2.0.15" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.parser.v3:swagger-parser-v3:2.0.15" level="project" />
+    <orderEntry type="library" name="Maven: com.samskivert:jmustache:1.14" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jknack:handlebars:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jknack:handlebars-jackson2:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-ext:1.7.12" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.cal10n:cal10n-api:0.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:26.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.5.2" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-guava:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.atlassian.commonmark:commonmark:0.11.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.mifmif:generex:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: dk.brics.automaton:automaton:1.11-8" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.joschi.jackson:jackson-datatype-threetenbp:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: org.threeten:threetenbp:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.openapitools:openapi-generator-core:4.2.1" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.6.1" level="project" />
@@ -28,12 +120,15 @@
     <orderEntry type="library" scope="TEST" name="Maven: info.cukes:cucumber-jvm-deps:1.0.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: info.cukes:gherkin:2.12.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: info.cukes:cucumber-junit:1.2.5" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp:okhttp:2.7.5" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.6.0" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp:logging-interceptor:2.7.5" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.2.2" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.50" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:4.2.2" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.5" level="project" />
+    <orderEntry type="library" name="Maven: io.gsonfire:gson-fire:1.8.3" level="project" />
     <orderEntry type="library" name="Maven: com.brsanthu:migbase64:2.2" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.9" level="project" />
   </component>
 </module>