Skip to content
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.

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

TASK-6780 - Port Patch 5.2.1 -> 6.0.0 - Xetabase 2.2.1 -> 3.0.0 #94

Merged
merged 106 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
e36d096
Merge branch 'release-5.0.x'
juanfeSanahuja Mar 4, 2024
d11319b
Restore branch before the aborted release
juanfeSanahuja Mar 5, 2024
0e5cade
Merge branch 'develop'
juanfeSanahuja Mar 7, 2024
6f95f01
Merge branch 'develop'
juanfeSanahuja Mar 7, 2024
4d428f0
Merge branch 'release-5.0.x'
juanfeSanahuja Mar 7, 2024
717f469
Merge branch 'release-5.1.x'
juanfeSanahuja May 20, 2024
1955035
utils: add the method FileUtils.copyFile, #TASK-6297, #TASK-6255
jtarraga Jun 3, 2024
df70872
test-xetabase-workflow.yml: New workflow to test xetabase on pullrequ…
juanfeSanahuja Jun 20, 2024
3f2f4eb
test-xetabase-workflow.yml: New workflow to test xetabase on pullrequ…
juanfeSanahuja Jun 20, 2024
37bfcd1
test-xetabase-workflow.yml: Modify pull_request approve workflow to t…
juanfeSanahuja Jun 20, 2024
f930213
cicd:clone jcl to exec script in pull request approve #TASK-6399
juanfeSanahuja Jun 20, 2024
9b2e5cf
cicd: fix parenthesi #TASK-6399
juanfeSanahuja Jun 20, 2024
b514929
cicd: debug ./.github/workflows/ #TASK-6399
juanfeSanahuja Jun 20, 2024
f8be19c
CICD: Added ZETTA_REPO_ACCESS_TOKEN to co xetabase #TASK-6399
juanfeSanahuja Jun 25, 2024
9a6e09c
Merge branch 'develop' into TASK-6399
juanfeSanahuja Jun 25, 2024
6cca2db
cicd: Temporal workflow_dispatch for PR to tests #TASK-6399
juanfeSanahuja Jun 25, 2024
1aa53aa
cicd: Delete Temporal workflow_dispatch for PR to tests #TASK-6399
juanfeSanahuja Jun 25, 2024
2d4f90f
Merge branch 'develop' into TASK-6399
juanfeSanahuja Jun 25, 2024
e29adf1
cicd: Temporal call to TASK-6399 yml #TASK-6399
juanfeSanahuja Jun 25, 2024
55e0c2f
cicd: Temporal call to TASK-6399 yml #TASK-6399
juanfeSanahuja Jun 25, 2024
2083020
create workflow in develop to test xetabase #TASK-6399
juanfeSanahuja Jun 25, 2024
e0d2601
Separate in two jobs to run the tests #TASK-6399
juanfeSanahuja Jun 25, 2024
fa6d57a
Merge branch 'develop' into TASK-6399
juanfeSanahuja Jun 25, 2024
606b93e
cicd secrets: inherit #TASK-6399
juanfeSanahuja Jun 25, 2024
8014992
cicd create outputs #TASK-6399
juanfeSanahuja Jun 25, 2024
8c8cf8c
cicd check bash --version #TASK-6399
juanfeSanahuja Jun 25, 2024
f6719a7
cicd check bash --version #TASK-6399
juanfeSanahuja Jun 25, 2024
26914c7
cicd: remove github.event. in inputs #TASK-6399
juanfeSanahuja Jun 25, 2024
b4b7a47
cicd: workflow dispatch to test#TASK-6399
juanfeSanahuja Jun 25, 2024
39ec574
cicd: debug logs added #TASK-6399
juanfeSanahuja Jun 25, 2024
3bea107
cicd: debug logs added #TASK-6399
juanfeSanahuja Jun 25, 2024
ae62676
cicd: debug logs added #TASK-6399
juanfeSanahuja Jun 25, 2024
f9acbc4
Merge branch 'develop' into TASK-6255
jtarraga Jun 28, 2024
6a7eee5
cicd: Test level short to fast test upload to report server #TASK-6399
juanfeSanahuja Jun 28, 2024
d5b4f38
cicd: Uncomment workflow_dispatch Test level short to fast test uploa…
juanfeSanahuja Jun 28, 2024
16d1cf8
Merge branch 'develop' into TASK-6399
juanfeSanahuja Jun 28, 2024
5bb1d4c
cicd: fix paths to upload artifacts #TASK-6399
juanfeSanahuja Jun 28, 2024
d4ebf31
Added keeper passwords #TASK-6399
juanfeSanahuja Jun 28, 2024
df6f77b
Added keeper passwords #TASK-6399
juanfeSanahuja Jun 28, 2024
8c9f958
cicd: Remove absolute references in Path #TASK-6399
juanfeSanahuja Jul 1, 2024
2b5ccec
Added get-xetabase-branch.sh #TASK-6399
juanfeSanahuja Jul 1, 2024
7d6d051
Added remove get-opencga-branch.sh #TASK-6399
juanfeSanahuja Jul 1, 2024
61b806a
Added log summary step #TASK-6399
juanfeSanahuja Jul 1, 2024
1f896dc
cicd: Removed test step in develop.yml #TASK-6399
juanfeSanahuja Jul 1, 2024
af9e16d
cicd: Add debug outputs #TASK-6399
juanfeSanahuja Jul 1, 2024
a0861c2
cicd: delete param to opencga_branch #TASK-6399
juanfeSanahuja Jul 1, 2024
9de5d3c
cicd: delete param to opencga_branch #TASK-6399
juanfeSanahuja Jul 1, 2024
98d3852
cicd:call to xetabase-branch.sh #TASK-6399
juanfeSanahuja Jul 1, 2024
75536da
cicd: Change AZURE_KUBE_CONFIG to secrets #TASK-6399
juanfeSanahuja Jul 2, 2024
bba0fad
Merge branch 'develop' into TASK-6255
jtarraga Jul 4, 2024
3bfbf9a
Rename get-opencga-xetabase-branch.sh reference
juanfeSanahuja Jul 9, 2024
8431eb8
cicd: Rename get-opencga-xetabase-branch.sh reference #TASK-6399
juanfeSanahuja Jul 9, 2024
49c4b3d
Merge branch 'TASK-6399' of github.com:opencb/java-common-libs into T…
juanfeSanahuja Jul 9, 2024
6aaaeb1
Merge branch 'develop' into TASK-6255
jtarraga Jul 10, 2024
64c6b2e
Merge branch 'develop' into TASK-6255
jtarraga Jul 10, 2024
3b2bbb6
Merge branch 'develop' into TASK-6255
jtarraga Jul 11, 2024
d9400ba
Merge branch 'TASK-6255' of https://github.com/opencb/java-common-lib…
jtarraga Jul 11, 2024
b0812f6
Merge branch 'release-5.2.x'
juanfeSanahuja Jul 17, 2024
17eb2d6
Prepare new development branch release-5.2.x
juanfeSanahuja Jul 17, 2024
c2ca645
Merge branch 'release-5.2.x' into TASK-6255
jtarraga Jul 22, 2024
d90261e
Merge branch 'release-5.2.x' into TASK-6399
juanfeSanahuja Jul 29, 2024
5ccb902
Merge pull request #87 from opencb/TASK-6399
juanfeSanahuja Aug 14, 2024
f97a0ef
Merge branch 'release-5.2.x' into TASK-6255
pfurio Aug 20, 2024
265f211
Merge pull request #85 from opencb/TASK-6255
pfurio Aug 20, 2024
d18cc5a
cicd: Fix "needs" dependency at develop.yml #TASK-6753
j-coll Aug 21, 2024
3673fb8
Merge pull request #89 from opencb/TASK-6753
j-coll Aug 21, 2024
e280466
cicd: Upload reference to develop branch in pull-request-approve to t…
juanfeSanahuja Sep 4, 2024
e8552ed
cicd: Refactor and fix SSH env values #TASK-6807
juanfeSanahuja Sep 5, 2024
59ad86b
Env variables to FIX error #TASK-6807
juanfeSanahuja Sep 5, 2024
85e297a
Env variables to FIX error #TASK-6807
juanfeSanahuja Sep 5, 2024
abb3b6b
Fix get-xetabase-branch #TASK-6807
juanfeSanahuja Sep 5, 2024
12a5159
Fix get-xetabase-branch #TASK-6807
juanfeSanahuja Sep 5, 2024
9182e1e
Fix get-xetabase-branch #TASK-6807
juanfeSanahuja Sep 5, 2024
2d940e3
Fix get-xetabase-branch #TASK-6807
juanfeSanahuja Sep 5, 2024
230010e
Fix get-xetabase-branch #TASK-6807
juanfeSanahuja Sep 5, 2024
a4d2fbb
Fix get-xetabase-branch #TASK-6807
juanfeSanahuja Sep 5, 2024
8e3cc88
Fix get-xetabase-branch #TASK-6807
juanfeSanahuja Sep 5, 2024
f84ebf3
Fix get-xetabase-branch #TASK-6807
juanfeSanahuja Sep 5, 2024
6ca7c8c
Fix get-xetabase-branch #TASK-6807
juanfeSanahuja Sep 5, 2024
9272829
TEST workflow for pull-request #TASK-6807
juanfeSanahuja Sep 5, 2024
5d473dd
TEST workflow for pull-request #TASK-6807
juanfeSanahuja Sep 5, 2024
7b2a8b0
TEST workflow for pull-request #TASK-6807
juanfeSanahuja Sep 5, 2024
c3fbf52
TEST workflow for pull-request #TASK-6807
juanfeSanahuja Sep 5, 2024
546ea97
TEST workflow for pull-request #TASK-6807
juanfeSanahuja Sep 5, 2024
b870aa0
TEST workflow for pull-request #TASK-6807
juanfeSanahuja Sep 5, 2024
ba5a19e
TEST workflow for pull-request #TASK-6807
juanfeSanahuja Sep 5, 2024
ca2ede1
TEST workflow for pull-request #TASK-6807
juanfeSanahuja Sep 5, 2024
9241eb2
TEST workflow for pull-request #TASK-6807
juanfeSanahuja Sep 5, 2024
ca6debc
TEST workflow for pull-request #TASK-6807
juanfeSanahuja Sep 5, 2024
47688af
TEST workflow for pull-request #TASK-6807
juanfeSanahuja Sep 5, 2024
3efd0b5
TEST workflow for pull-request #TASK-6807
juanfeSanahuja Sep 5, 2024
45e3902
TEST workflow for pull-request #TASK-6807
juanfeSanahuja Sep 5, 2024
f4a286f
TEST workflow for pull-request #TASK-6807
juanfeSanahuja Sep 5, 2024
534106c
TEST workflow for pull-request #TASK-6807
juanfeSanahuja Sep 5, 2024
039c4fd
Fix ssh to report server #TASK-6807
juanfeSanahuja Sep 9, 2024
c07c902
pull-request-approve Remove fail-never #TASK-6807
juanfeSanahuja Sep 12, 2024
502537f
pull-request-approve Remove fail-never #TASK-6807
juanfeSanahuja Sep 12, 2024
f0df3a2
Merge pull request #90 from opencb/TASK-6807
juanfeSanahuja Sep 12, 2024
113c1f2
Prepare release 5.2.1
juanfeSanahuja Sep 13, 2024
89ee779
Merge branch 'release-5.2.x'
juanfeSanahuja Sep 13, 2024
b41110c
Prepare Port Patch 5.2.1 -> 6.0.0 XB 2.2.1 -> 3.0.0 #TASK-6780
juanfeSanahuja Oct 3, 2024
b6cf47a
Merge branch 'develop' into TASK-6780
juanfeSanahuja Oct 3, 2024
b1a19c6
CICD: deleted tmp yml file #TASK-6780
juanfeSanahuja Oct 3, 2024
1918805
CICD: deleted tmp yml file #TASK-6780
juanfeSanahuja Oct 3, 2024
2b1d96c
Fix downgrade versions in merge #TASK-6780
juanfeSanahuja Oct 14, 2024
f40fe21
Merge branch 'develop' into TASK-6780
juanfeSanahuja Oct 14, 2024
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
7 changes: 1 addition & 6 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,7 @@ jobs:
build:
uses: ./.github/workflows/build-java-app-workflow.yml

test:
uses: ./.github/workflows/test-analysis.yml
needs: build
secrets: inherit

deploy-maven:
uses: ./.github/workflows/deploy-maven-repository-workflow.yml
needs: test
needs: build
secrets: inherit
1 change: 1 addition & 0 deletions .github/workflows/scripts/get-xetabase-branch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ get_xetabase_branch() {

# Check if the branch name starts with "release-" and follows the patterns "release-a.x.x" or "release-a.b.x"
if [[ "$input_branch" =~ ^release-([0-9]+)\.x\.x$ ]] || [[ "$input_branch" =~ ^release-([0-9]+)\.([0-9]+)\.x$ ]]; then

# Extract the MAJOR part of the branch name
MAJOR=${BASH_REMATCH[1]}
# Calculate the XETABASE_MAJOR by subtracting 3 from MAJOR
Expand Down
48 changes: 0 additions & 48 deletions .github/workflows/tmp-test-xetabase-branch.yml

This file was deleted.

7 changes: 7 additions & 0 deletions commons-lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.8.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
22 changes: 22 additions & 0 deletions commons-lib/src/main/java/org/opencb/commons/utils/FileUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import org.apache.commons.lang3.StringUtils;
import org.opencb.commons.exec.Command;
import org.slf4j.LoggerFactory;

import java.io.*;
import java.nio.charset.Charset;
Expand Down Expand Up @@ -188,6 +189,27 @@ public static String[] getUserAndGroup(Path path, boolean numericId) throws IOEx
return new String[]{split[2], split[3]};
}


public static void copyFile(File src, File dest) throws IOException {
try {
org.apache.commons.io.FileUtils.copyFile(src, dest);
} catch (IOException e) {
try {
if (src.length() == dest.length()) {
LoggerFactory.getLogger(FileUtils.class).warn(e.getMessage());
return;
}
throw e;
} catch (Exception e1) {
throw e;
}
}
}

//-------------------------------------------------------------------------
// P R I V A T E M E T H O D S
//-------------------------------------------------------------------------

private static String getLsOutput(Path path, boolean numericId) throws IOException {
FileUtils.checkPath(path);

Expand Down
Loading