Skip to content

Bump configuration-as-code from 1.34 to 1.35 #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timja merged 28 commits into from
Apr 8, 2020
Merged

Bump configuration-as-code from 1.34 to 1.35 #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e66bbe2
Revert "Revert "Bump configuration-as-code from 1.34 to 1.35 (test ha…
timja Jan 17, 2020
1d85a70
Bump plugins after jcasc fix
timja Jan 17, 2020
bc5fb72
chmod +x prep.sh
timja Jan 17, 2020
7ff6ddf
chmod +x pct.sh
timja Jan 17, 2020
547f252
Make pct fail on test failures,
timja Jan 17, 2020
c3342a1
Use SNAPSHOTs till release
timja Jan 18, 2020
5f1d024
Ignore local files for running PCT
timja Jan 18, 2020
26c1a5c
Use released git plugin versions
timja Jan 18, 2020
6254b7d
Snapshot doesn't work
timja Jan 18, 2020
9696b39
Bump ssh-credentials
timja Jan 18, 2020
349476b
Use backported ssh-credentials
timja Jan 20, 2020
ff3580a
Bump ssh-slaves
timja Jan 23, 2020
285b75d
Bump script-security from 1.68 to 1.69
jetersen Jan 28, 2020
f6f9b0f
Merge branch 'master' into revert-164-revert-161-patch-1
jetersen Jan 28, 2020
64fd457
set failFast to false for debugging
jetersen Jan 28, 2020
74a4f24
Rerun CI
timja Jan 28, 2020
6c4462e
Update pct.sh
timja Jan 28, 2020
d43d998
bump cloudbees-folder-plugin
timja Jan 30, 2020
3159d74
Merge branch 'revert-164-revert-161-patch-1' of github.com:timja/bom …
timja Jan 30, 2020
317b162
Rerun CI
timja Jan 30, 2020
8826391
Bump workflow-api
timja Jan 31, 2020
99bd76e
Merge branch 'master' into revert-164-revert-161-patch-1
timja Jan 31, 2020
96b6981
Update pom.xml
Feb 24, 2020
d241f21
Move structs to top
timja Mar 3, 2020
7e17b8c
Merge branch 'revert-164-revert-161-patch-1' of github.com:timja/bom …
timja Mar 3, 2020
38c6400
Ignore cloudbees-folder
timja Mar 5, 2020
29259ee
Revert unneeded changes
timja Mar 5, 2020
be11c16
Update failFast
timja Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
target
.idea/
*.iml
pct-work/
pct-report.*
logs/
megawar.war
pct.jar

25 changes: 12 additions & 13 deletions bom-latest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<artifactId>bom-2.176.x</artifactId>
<packaging>pom</packaging>
<properties>
<configuration-as-code-plugin.version>1.34</configuration-as-code-plugin.version>
<git-plugin.version>4.0.0</git-plugin.version>
<configuration-as-code-plugin.version>1.35</configuration-as-code-plugin.version>
<git-plugin.version>4.1.0</git-plugin.version>
<scm-api-plugin.version>2.6.3</scm-api-plugin.version>
<structs-plugin.version>1.20</structs-plugin.version>
<workflow-api-plugin.version>2.39</workflow-api-plugin.version>
Expand All @@ -27,10 +27,9 @@
<version>${configuration-as-code-plugin.version}</version>
</dependency>
<dependency>
<groupId>io.jenkins</groupId>
<artifactId>configuration-as-code</artifactId>
<groupId>io.jenkins.configuration-as-code</groupId>
<artifactId>test-harness</artifactId>
<version>${configuration-as-code-plugin.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand Down Expand Up @@ -119,7 +118,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>cloudbees-folder</artifactId>
<version>6.10.1</version>
<version>6.11.1</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -129,7 +128,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>2.3.0</version>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -160,7 +159,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git-client</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -195,7 +194,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>mailer</artifactId>
<version>1.29</version>
<version>1.30</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -231,17 +230,17 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>script-security</artifactId>
<version>1.68</version>
<version>1.69</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-credentials</artifactId>
<version>1.17.3</version>
<version>1.17.4</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-slaves</artifactId>
<version>1.30.2</version>
<version>1.30.4</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -251,7 +250,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>timestamper</artifactId>
<version>1.10</version>
<version>1.11</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down
Empty file modified local-test.sh
100644 → 100755
View file
Open in desktop
Empty file.
8 changes: 7 additions & 1 deletion pct.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,20 @@ java -jar pct.jar \
-mavenProperties "$MAVEN_PROPERTIES" \
-skipTestCache true

if fgrep -q '<status>INTERNAL_ERROR</status>' pct-report.xml
if grep -q -F -e '<status>INTERNAL_ERROR</status>' pct-report.xml
then
echo PCT failed
cat pct-report.xml
exit 1
fi

# TODO rather than removing all these, have a text file of known failures and just convert them to “skipped”

# TODO wrong detached plugin is being picked up
# Structs Plugin version 1.7 is older than required. To fix, install version 1.20 or later.
# we have 1.20 managed currently
rm -fv pct-work/cloudbees-folder/target/surefire-reports/TEST-InjectedTest.xml

# TODO https://github.com/jenkinsci/jenkins/pull/4120 problems with workflow-cps → jquery-detached:
rm -fv pct-work/structs-plugin/plugin/target/surefire-reports/TEST-InjectedTest.xml
rm -fv pct-work/apache-httpcomponents-client-4-api/target/surefire-reports/TEST-InjectedTest.xml
Expand Down
Empty file modified prep.sh
100644 → 100755
View file
Open in desktop
Empty file.
5 changes: 2 additions & 3 deletions sample-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.jenkins</groupId>
<artifactId>configuration-as-code</artifactId>
<classifier>tests</classifier>
<groupId>io.jenkins.configuration-as-code</groupId>
<artifactId>test-harness</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down