Add Jfrog platform URL into Jenkins configuration page #455

Or-Geva · 2021-04-20T15:30:40Z

All tests passed. If this feature is not already covered by the tests, I added new tests.
This pull request is created in the jfrog/jenkins-artifactory-plugin repository.

A new field called 'platform URL' in Jenkins configuration page.
Create platform URL after publishing build step.
Support pipeline steps only.

The new Jfrog configuration looks like this:

github-actions · 2021-04-20T15:31:26Z

CLA Assistant Lite bot All contributors have signed the CLA ✍️

eyalbe4

I haven't gone through everything yet, but I did add a few naming corrections.
For example, we should change ...Jfrog... --> ...JFrog...
and also JFrogServers should be change to JFrogInstance - we includes two important changes -

Plural to singular
"server" to "instance".

I suggest you go ahead and implement these changes all across the code (I didn't point out all places).

LMK once done, and I'll restart the CR.
Thanks!

src/main/java/org/jfrog/hudson/JfrogServers.java

src/main/java/org/jfrog/hudson/trigger/ArtifactoryTrigger.java

src/main/java/org/jfrog/hudson/util/RepositoriesUtils.java

src/main/java/org/jfrog/hudson/pipeline/common/executors/GetJfrogServersExecutor.java

src/main/java/org/jfrog/hudson/pipeline/common/executors/PublishBuildInfoExecutor.java

src/main/java/org/jfrog/hudson/pipeline/common/types/ArtifactoryServer.java

src/main/java/org/jfrog/hudson/pipeline/scripted/dsl/JfrogPipelineGlobal.java

src/main/java/org/jfrog/hudson/pipeline/common/types/ArtifactoryServer.java

src/main/java/org/jfrog/hudson/ArtifactoryBuilder.java

src/main/java/org/jfrog/hudson/BuildInfoResultAction.java

src/test/java/org/jfrog/hudson/pipeline/integration/DeclarativeITest.java

README.md

eyalbe4 · 2021-05-06T10:00:27Z

src/test/resources/integration/pipelines/declarative/buildAppend.pipeline

@@ -10,7 +10,7 @@ node("TestSlave") {
    stage "Configuration"
    rtServer(
            id: serverId,
-            url: "${env.JENKINS_ARTIFACTORY_URL}",
+            url: "${env.JENKINS_PLATFORM_URL}".replaceFirst('/*$', '')+'/artifactory',


Replacing the first slash in the URL means the URL must not include slashes.
We should remove the last character from the URL, if it is a slash. It is best to do this from outside the pipeline script, from within the tests infra code.

OK - please ignore. LGTM.

basil · 2021-05-28T15:12:22Z

src/main/java/org/jfrog/hudson/ArtifactoryBuilder.java

+        /**
+         * @deprecated: Use org.jfrog.hudson.ArtifactoryBuilder.DescriptorImpl#getJfrogInstances()
+         */
+        @Deprecated
        private List<ArtifactoryServer> artifactoryServers;


Needs to be marked transient as described in the Jenkins developer documentation. That it was not broke JCasC export.

basil · 2021-05-28T15:13:59Z

src/main/java/org/jfrog/hudson/util/converters/ArtifactoryBuilderConverter.java

+            if (artifactoryServersObj != null && jfrogServersObj == null) {
+                List<ArtifactoryServer> artifactoryServers = (List<ArtifactoryServer>) artifactoryServersObj;
+                // Must not be null.
+                // Once the artifactory builder will get save in the new form(jfrog instances), it is no longer needed to do a conversion.
+                // In order to identify if a conversion has already made for the first time, we validate if 'jfrogInstances' is found.
+                List<JFrogPlatformInstance> jfrogInstances = new ArrayList<>();
+                for (ArtifactoryServer artifactoryServer : artifactoryServers) {
+                    jfrogInstances.add(new JFrogPlatformInstance(artifactoryServer));
+                }
+                jfrogInstancesField.set(artifactoryBuilder, jfrogInstances);
+            }


By convention, migration logic like this in Jenkins is typically written in an XStream readResolve() method as described in the Jenkins developer documentation (where it does not need to use reflection), but this technically works.

Thanks for the feedback @basil!.

> but this technically works.

I may be missing something but if this works, are we in danger that something will break in the future? or this feedback is just a convention use case.
I'm to try to prioritize this task.

if this works, are we in danger that something will break in the future? or this feedback is just a convention use case.

The latter.

I'm to try to prioritize this task.

The priority should be to add JCasC tests to this repository using the JCasC test harness. This will ensure that future changes to this repository do not break JCasC support.

basil · 2021-05-28T15:14:44Z

src/test/java/org/jfrog/hudson/util/converters/ArtifactoryBuilderConverterTest.java

+    @Test
+    public void testConvertToArtifactoryServers_pre_3_10_6() throws IOException {
+        ArtifactoryBuilder.DescriptorImpl testBuilder = ExtensionList.lookupSingleton(ArtifactoryBuilder.DescriptorImpl.class);
+        File testFile = new File(getClass().getResource("/converters/config-3.10.6-1.xml").getFile());


By convention, Jenkins migration test logic like this typically uses the org.jvnet.hudson.test.recipes.LocalData annotation, but this technically works.

#455 (comment)

* Bump artifactory from 3.4.0 to 3.11.0 Bumps [artifactory](https://github.com/jenkinsci/artifactory-plugin) from 3.4.0 to 3.11.0. - [Release notes](https://github.com/jenkinsci/artifactory-plugin/releases) - [Commits](jenkinsci/artifactory-plugin@artifactory-3.4.0...artifactory-3.11.0) Signed-off-by: dependabot[bot] <[email protected]> * Require upper bound dependencies error for org.jenkins-ci.main:maven-plugin:3.1.2 paths to dependency are: +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.1.2 (managed) <-- org.jenkins-ci.main:maven-plugin:3.4 * Require upper bound dependencies error for org.codehaus.plexus:plexus-classworlds:2.5.2 paths to dependency are: +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.codehaus.plexus:plexus-classworlds:2.5.2 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.codehaus.plexus:plexus-classworlds:2.6.0 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.jenkins-ci.main.maven:maven3-agent:1.13 +-org.codehaus.plexus:plexus-classworlds:2.4.2 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.jenkins-ci.main.maven:maven31-agent:1.13 +-org.codehaus.plexus:plexus-classworlds:2.4.2 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.jenkins-ci.main.maven:maven32-agent:1.13 +-org.codehaus.plexus:plexus-classworlds:2.5.1 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.jenkins-ci.main.maven:maven33-agent:1.13 +-org.codehaus.plexus:plexus-classworlds:2.5.2 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.jenkins-ci.main.maven:maven35-agent:1.13 +-org.codehaus.plexus:plexus-classworlds:2.6.0 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.jenkins-ci.main.maven:maven32-interceptor:1.13 +-org.codehaus.plexus:plexus-classworlds:2.5.1 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.apache.maven:maven-core:3.5.4 +-org.codehaus.plexus:plexus-classworlds:2.5.2 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.apache.maven:maven-embedder:3.5.4 +-org.codehaus.plexus:plexus-classworlds:2.5.2 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.3 +-org.codehaus.plexus:plexus-classworlds:2.5.2 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.jenkins-ci.lib:lib-jenkins-maven-embedder:3.14 +-org.codehaus.plexus:plexus-classworlds:2.6.0 * Require upper bound dependencies error for org.apache.maven:maven-artifact:3.5.0 paths to dependency are: +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:jira:3.0.8 +-org.apache.maven:maven-artifact:3.5.0 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.apache.maven:maven-core:3.5.4 +-org.apache.maven:maven-artifact:3.5.4 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.apache.maven:maven-compat:3.5.4 +-org.apache.maven:maven-artifact:3.5.4 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.jenkins-ci.lib:lib-jenkins-maven-embedder:3.14 +-org.apache.maven:maven-artifact:3.5.4 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.apache.maven:maven-core:3.5.4 +-org.apache.maven:maven-plugin-api:3.3.3 (managed) <-- org.apache.maven:maven-plugin-api:3.5.4 +-org.apache.maven:maven-artifact:3.3.3 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.apache.maven:maven-core:3.5.4 +-org.apache.maven:maven-model-builder:3.5.4 +-org.apache.maven:maven-artifact:3.5.4 * Require upper bound dependencies error for org.apache.maven:maven-plugin-api:3.3.3 paths to dependency are: +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.apache.maven:maven-core:3.5.4 +-org.apache.maven:maven-plugin-api:3.3.3 (managed) <-- org.apache.maven:maven-plugin-api:3.5.4 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jenkins-ci.main:maven-plugin:3.4 +-org.apache.maven:maven-embedder:3.5.4 +-org.apache.maven:maven-plugin-api:3.3.3 (managed) <-- org.apache.maven:maven-plugin-api:3.5.4 * Require upper bound dependencies error for com.github.docker-java:docker-java:3.1.1 paths to dependency are: +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jfrog.buildinfo:build-info-extractor-docker:2.26.0 +-com.github.docker-java:docker-java:3.1.1 (managed) <-- com.github.docker-java:docker-java:3.1.5 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-io.jenkins.docker:docker-plugin:1.1.2 +-org.jenkins-ci.plugins:docker-java-api:3.0.14 +-com.github.docker-java:docker-java:3.1.1 (managed) <-- com.github.docker-java:docker-java:3.0.14 * Require upper bound dependencies error for com.kohlschutter.junixsocket:junixsocket-common:2.0.4 paths to dependency are: +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-io.jenkins.docker:docker-plugin:1.1.2 +-com.kohlschutter.junixsocket:junixsocket-common:2.0.4 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-io.jenkins.docker:docker-plugin:1.1.2 +-com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4 +-com.kohlschutter.junixsocket:junixsocket-common:2.0.4 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jfrog.buildinfo:build-info-extractor-docker:2.26.0 +-com.github.docker-java:docker-java:3.1.5 +-com.kohlschutter.junixsocket:junixsocket-common:2.2.0 Require upper bound dependencies error for com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4 paths to dependency are: +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-io.jenkins.docker:docker-plugin:1.1.2 +-com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4 and +-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT +-org.jenkins-ci.plugins:artifactory:3.11.0 +-org.jfrog.buildinfo:build-info-extractor-docker:2.26.0 +-com.github.docker-java:docker-java:3.1.5 +-com.kohlschutter.junixsocket:junixsocket-native-common:2.2.0 * Update docs and tests for Artifactory >= 3.11.0 * More syntax updates * Pull in jfrog/jenkins-artifactory-plugin#455 * Apparently jfrog/jenkins-artifactory-plugin#478 fixed the export problem. Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Add Jfrog platform URL into Jenkins configuration page

992262d

Or-Geva requested review from eyalbe4 and yahavi April 20, 2021 15:30

Or-Geva mentioned this pull request Apr 20, 2021

Support JFrog platform URL for published build jfrog/build-info#478

Merged

1 task

Update README.md

437c355

eyalbe4 requested changes Apr 21, 2021

View reviewed changes

Or-Geva added 2 commits April 26, 2021 11:20

Artifactory URL autofill

7984222

Fix CR comments

79c9dd2

Or-Geva requested a review from eyalbe4 April 26, 2021 12:35

eyalbe4 requested changes May 4, 2021

View reviewed changes

Fix CR comments

008e863

Or-Geva requested a review from eyalbe4 May 5, 2021 14:18

eyalbe4 requested changes May 6, 2021

View reviewed changes

eyalbe4 approved these changes May 6, 2021

View reviewed changes

Fix tests

06500ab

Or-Geva merged commit 03a71a6 into jfrog:master May 6, 2021

basil reviewed May 28, 2021

View reviewed changes

basil mentioned this pull request May 28, 2021

Stop persisting deprecated artifactoryServers on serialization #492

Closed

basil added a commit to basil/configuration-as-code-plugin that referenced this pull request May 28, 2021

Pull in jfrog/jenkins-artifactory-plugin#455

dd4cf12

basil mentioned this pull request May 28, 2021

Bump artifactory from 3.4.0 to 3.11.2 jenkinsci/configuration-as-code-plugin#1610

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Jfrog platform URL into Jenkins configuration page #455

Add Jfrog platform URL into Jenkins configuration page #455

Or-Geva commented Apr 20, 2021 •

edited

Loading

github-actions bot commented Apr 20, 2021 •

edited

Loading

eyalbe4 left a comment

eyalbe4 May 6, 2021

eyalbe4 May 6, 2021

basil May 28, 2021

basil May 28, 2021

Or-Geva May 30, 2021 •

edited

Loading

basil May 30, 2021

basil May 28, 2021

Or-Geva May 30, 2021

Add Jfrog platform URL into Jenkins configuration page #455

Add Jfrog platform URL into Jenkins configuration page #455

Conversation

Or-Geva commented Apr 20, 2021 • edited Loading

github-actions bot commented Apr 20, 2021 • edited Loading

eyalbe4 left a comment

Choose a reason for hiding this comment

eyalbe4 May 6, 2021

Choose a reason for hiding this comment

eyalbe4 May 6, 2021

Choose a reason for hiding this comment

basil May 28, 2021

Choose a reason for hiding this comment

basil May 28, 2021

Choose a reason for hiding this comment

Or-Geva May 30, 2021 • edited Loading

Choose a reason for hiding this comment

basil May 30, 2021

Choose a reason for hiding this comment

basil May 28, 2021

Choose a reason for hiding this comment

Or-Geva May 30, 2021

Choose a reason for hiding this comment

Or-Geva commented Apr 20, 2021 •

edited

Loading

github-actions bot commented Apr 20, 2021 •

edited

Loading

Or-Geva May 30, 2021 •

edited

Loading