Skip to content

Commit 2b5f33a

Browse files
Brett Loganmbwhite
Brett Logan
authored and
mbwhite
committed
[FABCI-482] Update Nexus URL's to Artifactory
Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
1 parent bc99f73 commit 2b5f33a

File tree

8 files changed

+24
-148
lines changed

8 files changed

+24
-148
lines changed

‎ci/azure-pipelines.yml‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ variables:
3636
value: fabric-chaincode-java
3737
- name: pipeline
3838
value: ci
39-
- name: NEXUS_REPO_URL
40-
value: nexus3.hyperledger.org:10003
4139
- name: PUSH_VERSION
4240
value: stable
4341

@@ -113,36 +111,6 @@ stages:
113111
git push https://$(GITHUB-PAT)@github.com/hyperledger/fabric-chaincode-java.git gh-pages
114112
displayName: 'Commit gh-pages changes'
115113
116-
# Publish the snapshot images etc.
117-
# Original source of these is https://github.com/hyperledger/ci-management/blob/master/jjb/fabric-chaincode-java/shell/include-raw-publish-docker-jar.sh
118-
- job: publish
119-
dependsOn: main
120-
condition: and(succeeded(),eq(variables['Build.Reason'], 'IndividualCI'))
121-
variables:
122-
PACKAGE_VERSION: $[ dependencies.main.outputs['builddata.PACKAGE_VERSION'] ]
123-
steps:
124-
- task: DownloadPipelineArtifact@2
125-
inputs:
126-
artifact: javaenv-docker-image
127-
path: $(Build.SourcesDirectory)/build
128-
- script: |
129-
130-
docker image load --input build/fabric-javaenv.tar.gz
131-
docker images
132-
# Publish docker images to nexus repository
133-
docker login ${DOCKER_REGISTRY_URL} --username=${DOCKER_REGISTRY_USERNAME} --password=${DOCKER_REGISTRY_PASSWORD}
134-
echo "Logged in to docker registry"
135-
# tag javaenv image to $PUSH_VERSION
136-
docker tag hyperledger/fabric-javaenv ${DOCKER_REGISTRY_URL}/fabric-javaenv:amd64-${MAPPED_VERSION}-stable
137-
# push javaenv to nexus repository
138-
docker push ${DOCKER_REGISTRY_URL}/fabric-javaenv:amd64-${MAPPED_VERSION}-stable
139-
env:
140-
DOCKER_REGISTRY_USERNAME: $(nexus-user)
141-
DOCKER_REGISTRY_PASSWORD: $(nexus-password)
142-
DOCKER_REGISTRY_URL: nexus3.hyperledger.org:10003/hyperledger
143-
MAPPED_VERSION: $(PACKAGE_VERSION)
144-
displayName: 'docker push to nexus'
145-
146114
# As the next script is more complex and uses loops, run this descretely in a sh file
147115
# Publishing step for git tags
148116
- stage: Publish_tag
@@ -170,7 +138,6 @@ stages:
170138
171139
docker image load --input build/fabric-javaenv.tar.gz
172140
docker images
173-
# Publish docker images to nexus repository
174141
docker login ${DOCKER_REGISTRY_URL} --username=${DOCKER_REGISTRY_USERNAME} --password=${DOCKER_REGISTRY_PASSWORD}
175142
echo "Logged in to docker registry"
176143
# tag javaenv image to $PUSH_VERSION

‎fabric-chaincode-docker/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ RUN source /root/.sdkman/bin/sdkman-init.sh; mvn compile package
4848

4949
# Adding shim 1.3.0 jar
5050
WORKDIR /tmp
51-
RUN wget https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric-chaincode-java/fabric-chaincode-shim/1.3.0/fabric-chaincode-shim-1.3.0.pom
52-
RUN wget https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric-chaincode-java/fabric-chaincode-shim/1.3.0/fabric-chaincode-shim-1.3.0.jar
53-
RUN wget https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric-chaincode-java/fabric-chaincode-protos/1.3.0/fabric-chaincode-protos-1.3.0.pom
54-
RUN wget https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric-chaincode-java/fabric-chaincode-protos/1.3.0/fabric-chaincode-protos-1.3.0.jar
51+
RUN wget https://hyperledger.jfrog.io/hyperledger/fabric-maven/fabric-chaincode-shim/fabric-chaincode-shim/1.3.0/fabric-chaincode-shim-1.3.0.pom
52+
RUN wget https://hyperledger.jfrog.io/hyperledger/fabric-maven/fabric-chaincode-shim/fabric-chaincode-shim/1.3.0/fabric-chaincode-shim-1.3.0.jar
53+
RUN wget https://hyperledger.jfrog.io/hyperledger/fabric-maven/fabric-chaincode-protos/fabric-chaincode-protos/1.3.0/fabric-chaincode-protos-1.3.0.pom
54+
RUN wget https://hyperledger.jfrog.io/hyperledger/fabric-maven/fabric-chaincode-protos/fabric-chaincode-protos/1.3.0/fabric-chaincode-protos-1.3.0.jar
5555
RUN source /root/.sdkman/bin/sdkman-init.sh; mvn install::install-file -Dfile=fabric-chaincode-protos-1.3.0.jar -DpomFile=fabric-chaincode-protos-1.3.0.pom
5656
RUN source /root/.sdkman/bin/sdkman-init.sh; mvn install::install-file -Dfile=fabric-chaincode-shim-1.3.0.jar -DpomFile=fabric-chaincode-shim-1.3.0.pom
5757

‎fabric-chaincode-example-maven/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<url>https://www.jitpack.io</url>
3030
</repository>
3131
<repository>
32-
<id>nexus</id>
33-
<url>https://nexus.hyperledger.org/content/repositories/snapshots/</url>
32+
<id>artifactory</id>
33+
<url>https://hyperledger.jfrog.io/hyperledger/fabric-maven</url>
3434
</repository>
3535
</repositories>
3636

‎fabric-chaincode-integration-test/getDockerImages.sh‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ set -o pipefail
44
echo "======== PULL DOCKER IMAGES ========"
55

66
##########################################################
7-
# Pull and Tag the fabric and fabric-ca images from Nexus
7+
# Pull and Tag the fabric and fabric-ca images from Artifactory
88
##########################################################
9-
echo "Fetching images from Nexus"
10-
# NEXUS_URL=nexus3.hyperledger.org:10001
11-
NEXUS_URL=hyperledger-fabric.jfrog.io
9+
echo "Fetching images from Artifactory"
10+
ARTIFACTORY_URL=hyperledger-fabric.jfrog.io
1211
ORG_NAME="fabric"
1312

1413
VERSION=2.0.0
@@ -20,25 +19,25 @@ MASTER_TAG=$ARCH-master
2019
echo "---------> STABLE_VERSION:" $STABLE_VERSION
2120

2221
dockerTag() {
23-
for IMAGES in peer orderer ca tools orderer ccenv; do
24-
echo "Images: $IMAGES"
22+
for IMAGE in peer orderer ca tools orderer ccenv; do
23+
echo "Images: $IMAGE"
2524
echo
26-
docker pull $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG
25+
docker pull $ARTIFACTORY_URL/fabric-$IMAGE:$STABLE_TAG
2726
if [ $? != 0 ]; then
2827
echo "FAILED: Docker Pull Failed on $IMAGES"
2928
exit 1
3029
fi
31-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG $ORG_NAME-$IMAGES
32-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG $ORG_NAME-$IMAGES:$MASTER_TAG
33-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG $ORG_NAME-$IMAGES:$VERSION
34-
echo "$ORG_NAME-$IMAGES:$MASTER_TAG"
35-
echo "Deleting Nexus docker images: $IMAGES"
36-
docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG
30+
docker tag $ARTIFACTORY_URL/fabric-$IMAGE:$STABLE_TAG fabric-$IMAGE
31+
docker tag $ARTIFACTORY_URL/fabric-$IMAGE:$STABLE_TAG fabric-$IMAGE:$MASTER_TAG
32+
docker tag $ARTIFACTORY_URL/fabric-$IMAGE:$STABLE_TAG fabric-$IMAGE:$VERSION
33+
echo "$ORG_NAME-$IMAGE:$MASTER_TAG"
34+
echo "Deleting Artifactory docker images: $IMAGE"
35+
docker rmi -f $ARTIFACTORY_URL/fabric-$IMAGE:$STABLE_TAG
3736
done
3837
}
3938

4039
dockerTag
4140

4241
echo
4342
docker images | grep "hyperledger*"
44-
echo
43+
echo

‎fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/SBECCIntegrationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void RunSBE_pub_setget() throws NoSuchAlgorithmException, InvalidKeySpecE
5252

5353
r = coreBuilder.duplicate().argsTx(new String[] { "setval", mode, "foo" }).build().run(true);
5454
assertThat(filter(r.stderr), containsString("result: status:200"));
55-
55+
5656
r = coreBuilder.duplicate().argsTx(new String[] { "getval", mode }).build().run(true);
5757
assertThat(filter(r.stderr), containsString("result: status:200"));
5858

@@ -152,7 +152,7 @@ public void RunSBE_priv() throws NoSuchAlgorithmException, InvalidKeySpecExcepti
152152
text = filter(r.stderr);
153153
assertThat(text, containsString("result: status:200 payload:\"[\\\"Org2MSP\\\",\\\"Org1MSP\\\"]\""));
154154

155-
155+
156156
r = coreBuilder.duplicate().argsTx(new String[] { "setval", mode, "val3" }).build().run(true);
157157
text = filter(r.stderr);
158158
assertThat(text, containsString("result: status:200"));

‎fabric-contract-example/gradle/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repositories {
1414
url "https://www.jitpack.io"
1515
}
1616
maven {
17-
url "https://nexus.hyperledger.org/content/repositories/snapshots/"
17+
url "https://hyperledger.jfrog.io/hyperledger/fabric-maven"
1818
}
1919

2020
}

‎fabric-contract-example/maven/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<url>https://www.jitpack.io</url>
3131
</repository>
3232
<repository>
33-
<id>nexus</id>
34-
<url>https://nexus.hyperledger.org/content/repositories/snapshots/</url>
33+
<id>artifactory</id>
34+
<url>https://hyperledger.jfrog.io/hyperledger/fabric-maven</url>
3535
</repository>
3636
</repositories>
3737

‎scripts/multiarch.sh‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)