Merge branch 'release/v3.0.0'

CHANGELOG.md

@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v3.ß.0] - 2024-12-12
+### Added
+- [#58] Add function to copy Dogu images to the Jenkins worker
+
+This release contains a **breaking change**. All Trivy-specific functionality has been removed.
+See [Scan Dogu image with Trivy](https://github.com/cloudogu/ces-build-lib/tree/main?tab=readme-ov-file##scan-dogu-image-with-trivy) for migration.
+
+### Removed
+- Removed all Trivy-specific functionality. Please use the Trivy class of the [ces-build-lib](https://github.com/cloudogu/ces-build-lib)
+
 ## [v2.6.0] - 2024-11-25
 ### Added
 - [#56] function to push a pre release to registry

README.md

@@ -58,6 +58,7 @@ EcoSystem ecosystem = new EcoSystem(this, "gcloud-ces-operations-internal-packer
 - upgradeFromPreviousRelease(String oldDoguVersionForUpgradeTest, String doguName, String namespace = "official") | upgrade dogu from previous version
 - restartDogu(String doguName, boolean waitUntilAvailable=true) | Restarts a dogu and by default waits until it is available again.
 - changeGlobalAdminGroup(String newAdminGroup) | Changes the global admin group to the given value.
+- copyDoguImageToJenkinsWorker(String doguPath) | Copies the built Dogu image from the CES machine to the Jenkins worker and imports it into Docker
 
 ##### runCypressIntegrationTests():
 

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.cloudogu.ces</groupId>
     <artifactId>dogu-build-lib</artifactId>
     <name>dogu-build-lib</name>
-    <version>2.6.0</version>
+    <version>3.0.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/com/cloudogu/ces/dogubuildlib/EcoSystem.groovy

@@ -25,13 +25,11 @@ class EcoSystem {
     Vagrant vagrant
     String externalIP
     String mountPath
-    Trivy trivy
 
     EcoSystem(script, String gcloudCredentials, String sshCredentials) {
         this.script = script
         this.gcloudCredentials = gcloudCredentials
         this.sshCredentials = sshCredentials
-        this.trivy = new Trivy(script, this)
     }
 
     void changeNamespace(String namespace, doguPath = null) {
@@ -285,21 +283,18 @@ class EcoSystem {
     }
 
     /**
-     * Executes a trivy scan for critical security issues in the image of the dogu in doguPath
+     * Copies the built Dogu image from the CES machine to the Jenkins worker and imports it into Docker
      * @param doguPath The path of the dogu sources
-     * @param failOnError
      */
-    void scanCriticalVulnerabilities(String doguPath, boolean failOnError) {
-        this.trivy.scanCritical(this.getDoguImage(doguPath), failOnError)
-    }
-
-    /**
-     * Executes a trivy scan for high and critical security issues in the image of the dogu in doguPath
-     * @param doguPath The path of the dogu sources
-     * @param failOnError
-     */
-    void scanHighOrCriticalVulnerabilities(String doguPath, boolean failOnError) {
-        this.trivy.scanHighOrCritical(this.getDoguImage(doguPath), failOnError)
+    void copyDoguImageToJenkinsWorker(String doguPath) {
+        String savedImageFileName = "savedImage.tar"
+        String savedImageFilePath = "${doguPath}/${savedImageFileName}"
+        String image = getDoguImage(doguPath)
+        vagrant.ssh("sudo docker save -o ${savedImageFilePath} ${image}")
+        vagrant.ssh("sudo chown jenkins:jenkins ${savedImageFilePath}")
+        vagrant.scp(":${savedImageFilePath}", "${savedImageFileName}")
+        script.sh("sudo docker image load -i ${savedImageFileName}")
+        script.sh("rm ${savedImageFileName}")
     }
 
     /**