diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 484d4ff25..9a5869012 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -22,6 +22,18 @@ jobs: uses: actions/setup-java@v1 with: java-version: 11 + - name: Check out TOSCA internal repository + uses: actions/checkout@v2 + with: + repository: OpenTOSCA/tosca-definitions-internal + ref: 'master' + token: '${{secrets.OPENTOSCAPRIVATEREPOACCESS}}' + path: 'tosca-definitions-public' + lfs: 'true' + - name: Copy TOSCA internal repository to tmp + run: cp -R $GITHUB_WORKSPACE/tosca-definitions-public /tmp/ + - name: Show TOSCA internal repository content + run: ls -a /tmp/tosca-definitions-public - name: Setup Docker Remote API run: sudo sed -ie "s@ExecStart=\/usr\/bin\/dockerd -H fd:\/\/@ExecStart=\/usr\/bin\/dockerd -H fd:\/\/ -H tcp:\/\/0.0.0.0:2375 -H unix:///var/run/docker.sock@g" /lib/systemd/system/docker.service - name: Reload Daemons @@ -36,16 +48,6 @@ jobs: run: curl -X GET http://localhost:2375/images/json - name: Start test environment run: docker-compose -f test.yml up -d - - name: Check out TOSCA-Public Repository - uses: actions/checkout@v2 - with: - repository: OpenTOSCA/tosca-definitions-public - path: 'tosca-definitions-public' - lfs: 'true' - - name: Copy TOSCA-Public Repository to tmp - run: cp -R $GITHUB_WORKSPACE/tosca-definitions-public /tmp/ - - name: Show TOSCA-Public Repository content - run: ls -a /tmp/tosca-definitions-public - name: Sleep for 45 seconds uses: whatnick/wait-action@master with: diff --git a/org.opentosca.container.war/src/test/java/MyTinyToDoIntegrationTest.java b/org.opentosca.container.war/src/test/java/MyTinyToDoIntegrationTest.java index 54ca36397..3e4a52599 100644 --- a/org.opentosca.container.war/src/test/java/MyTinyToDoIntegrationTest.java +++ b/org.opentosca.container.war/src/test/java/MyTinyToDoIntegrationTest.java @@ -337,9 +337,6 @@ protected void fetchCSARFromPublicRepository(RepositoryConfigurationObject.Repos .call(); } else { LOGGER.info("Found git repository under " + this.repositoryPath); - //Repository gitRepo = builder.setWorkTree(repositoryPath.toFile()).setMustExist(false).build(); - //this.git = new Git(gitRepo); - //this.git.fetch().call(); } // inject the current path to the repository factory